karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to CodeIgniter 2.0.3

Browse Source
This commit is contained in:
Eike Foken
2011-09-13 19:15:50 +02:00
parent 8dd1099e04
commit a8c2551be2
53 changed files with 1949 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
system/helpers/html_helper.php
View File

@@ -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))