Upgrade to CodeIgniter 2.0.3

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

View File

@@ -366,13 +366,13 @@ if ( ! function_exists('convert_accented_characters'))
{
function convert_accented_characters($str)
{
if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php'))
{
include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT);
include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php');
}
elseif (is_file(APPPATH.'config/foreign_chars'.EXT))
elseif (is_file(APPPATH.'config/foreign_chars.php'))
{
include(APPPATH.'config/foreign_chars'.EXT);
include(APPPATH.'config/foreign_chars.php');
}
if ( ! isset($foreign_characters))