diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-20 18:58:58 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-20 18:58:58 +0200 |
| commit | abbad9ea53e81c6e3211029711ac5b2ab4f1978d (patch) | |
| tree | 9a4d5a8587da1dd3a365251afa37be2f835a53c2 /system/helpers/html_helper.php | |
| parent | 71644d683d0a15a6f7e04fabd0f51a4200d620b4 (diff) | |
| parent | d56be70257696d0bbf2dcc880888d8dc17cba21c (diff) | |
Merge branch 'develop' into feature/unit-tests
Conflicts:
.hgignore
Diffstat (limited to 'system/helpers/html_helper.php')
| -rw-r--r-- | system/helpers/html_helper.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index bd66bc2d0..b64b60650 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * @@ -30,7 +30,7 @@ /** * Heading * - * Generates an HTML heading tag. First param is the data. + * Generates an HTML heading tag. First param is the data. * Second param is the size of the heading tag. * * @access public @@ -114,7 +114,7 @@ if ( ! function_exists('_list')) // Set the indentation based on the depth $out = str_repeat(" ", $depth); - // Were any attributes submitted? If so generate a string + // Were any attributes submitted? If so generate a string if (is_array($attributes)) { $atts = ''; @@ -124,11 +124,15 @@ 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"; - // Cycle through the list elements. If an array is + // Cycle through the list elements. If an array is // encountered we will recursively call _list() static $_last_list_item = ''; @@ -244,7 +248,7 @@ if ( ! function_exists('img')) * Generates a page document type declaration * * Valid options are xhtml-11, xhtml-strict, xhtml-trans, xhtml-frame, - * html4-strict, html4-trans, and html4-frame. Values are saved in the + * html4-strict, html4-trans, and html4-frame. Values are saved in the * doctypes config file. * * @access public |