diff options
| author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
| commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
| tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/helpers/html_helper.php | |
| parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
| parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) | |
Merge branch 'working'
Diffstat (limited to 'system/helpers/html_helper.php')
| -rwxr-xr-x | system/helpers/html_helper.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index c6103ab6f..b64b60650 100755 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -40,9 +40,10 @@ */ if ( ! function_exists('heading')) { - function heading($data = '', $h = '1') + function heading($data = '', $h = '1', $attributes = '') { - return "<h".$h.">".$data."</h".$h.">"; + $attributes = ($attributes != '') ? ' '.$attributes : $attributes; + return "<h".$h.$attributes.">".$data."</h".$h.">"; } } @@ -123,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"; @@ -258,13 +263,13 @@ if ( ! function_exists('doctype')) if ( ! is_array($_doctypes)) { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'); } - elseif (is_file(APPPATH.'config/doctypes'.EXT)) + elseif (is_file(APPPATH.'config/doctypes.php')) { - include(APPPATH.'config/doctypes'.EXT); + include(APPPATH.'config/doctypes.php'); } if ( ! is_array($_doctypes)) |