summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-07-23 00:11:52 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-07-23 00:11:52 +0200
commited9324264a4cea861abb98781f260ab170d2ac05 (patch)
tree5323b7810e592218c27a5505b5e69effce44c9e5 /system
parent8731f641de823fcdcb8b2a2fa6034fca8fe4a164 (diff)
parent6addf31e8f05758aa6f0eba4438d450d5b563402 (diff)
Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into develop
Diffstat (limited to 'system')
-rw-r--r--system/helpers/html_helper.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 080f622dd..b64b60650 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -124,6 +124,10 @@ if ( ! function_exists('_list'))
}
$attributes = $atts;
}
+ elseif (is_string($attributes) AND strlen($attributes) > 0)
+ {
+ $attributes = ' '. $attributes;
+ }
// Write the opening list tag
$out .= "<".$type.$attributes.">\n";