diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-09-25 15:03:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-09-25 15:03:59 +0200 |
| commit | 6705e6c987b6e4a43bbb666c33d8fc8a0ef1a0a6 (patch) | |
| tree | b815871f7f031633c400a33cf5d6245282d59955 /system | |
| parent | 50230001eb5387b6b0ff7ce906d074ef4a530d11 (diff) | |
| parent | ab98249a9a087745b29e5cb258ea0b624f12f64b (diff) | |
Merge branch 'working'
Diffstat (limited to 'system')
131 files changed, 10 insertions, 11 deletions
diff --git a/system/.htaccess b/system/.htaccess index 14249c50b..14249c50b 100755..100644 --- a/system/.htaccess +++ b/system/.htaccess diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index a200727ab..a200727ab 100755..100644 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index c16c79c09..e0819c801 100755..100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -33,7 +33,7 @@ * @var string * */ - define('CI_VERSION', '2.1.3'); + define('CI_VERSION', '2.1.4'); /** * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) diff --git a/system/core/Common.php b/system/core/Common.php index f8d80b957..f8d80b957 100755..100644 --- a/system/core/Common.php +++ b/system/core/Common.php diff --git a/system/core/Config.php b/system/core/Config.php index 5dffbf3f2..5dffbf3f2 100755..100644 --- a/system/core/Config.php +++ b/system/core/Config.php diff --git a/system/core/Controller.php b/system/core/Controller.php index fddb81e19..fddb81e19 100755..100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 869739a5a..869739a5a 100755..100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 33f1c034c..33f1c034c 100755..100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php diff --git a/system/core/Input.php b/system/core/Input.php index 0c1f2b08e..0c1f2b08e 100755..100644 --- a/system/core/Input.php +++ b/system/core/Input.php diff --git a/system/core/Lang.php b/system/core/Lang.php index 5ac671838..5ac671838 100755..100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php diff --git a/system/core/Loader.php b/system/core/Loader.php index 6b7ee0c28..6b7ee0c28 100755..100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php diff --git a/system/core/Model.php b/system/core/Model.php index e15ffbebc..e15ffbebc 100755..100644 --- a/system/core/Model.php +++ b/system/core/Model.php diff --git a/system/core/Output.php b/system/core/Output.php index ccecafd2b..ccecafd2b 100755..100644 --- a/system/core/Output.php +++ b/system/core/Output.php diff --git a/system/core/Router.php b/system/core/Router.php index 6da667472..6da667472 100755..100644 --- a/system/core/Router.php +++ b/system/core/Router.php diff --git a/system/core/Security.php b/system/core/Security.php index 00089d765..b0d39b981 100755..100644 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -619,17 +619,16 @@ class CI_Security { $count = 0; $attribs = array(); - // find occurrences of illegal attribute strings without quotes - preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER); + // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes) + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is', $str, $matches, PREG_SET_ORDER); foreach ($matches as $attr) { - $attribs[] = preg_quote($attr[0], '/'); } - // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes) - preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is", $str, $matches, PREG_SET_ORDER); + // find occurrences of illegal attribute strings without quotes + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER); foreach ($matches as $attr) { @@ -639,7 +638,7 @@ class CI_Security { // replace illegal attribute strings that are inside an html tag if (count($attribs) > 0) { - $str = preg_replace("/<(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(".implode('|', $attribs).")(.*?)([\s><])([><]*)/i", '<$1 $3$5$6$7', $str, -1, $count); + $str = preg_replace('/(<?)(\/?[^><]+?)([^A-Za-z<>\-])(.*?)('.implode('|', $attribs).')(.*?)([\s><]?)([><]*)/i', '$1$2 $4$6$7$8', $str, -1, $count); } } while ($count); @@ -873,4 +872,4 @@ class CI_Security { } /* End of file Security.php */ -/* Location: ./system/libraries/Security.php */
\ No newline at end of file +/* Location: ./system/libraries/Security.php */ diff --git a/system/core/URI.php b/system/core/URI.php index d3c25070e..d3c25070e 100755..100644 --- a/system/core/URI.php +++ b/system/core/URI.php diff --git a/system/core/Utf8.php b/system/core/Utf8.php index 2a27d1f35..2a27d1f35 100755..100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php diff --git a/system/core/index.html b/system/core/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/core/index.html +++ b/system/core/index.html diff --git a/system/database/DB.php b/system/database/DB.php index 8314d3b97..8314d3b97 100755..100644 --- a/system/database/DB.php +++ b/system/database/DB.php diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 841ede28e..4f3c46338 100755..100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1404,7 +1404,7 @@ class CI_DB_active_record extends CI_DB_driver { } else { - $not[] = $k.'-'.$v; + $not[] = $k2.'-'.$v2; } if ($escape === FALSE) diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index ad1c28d72..ad1c28d72 100755..100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 6bc40411b..6bc40411b 100755..100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 48d66c8e4..48d66c8e4 100755..100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 52196b7ce..52196b7ce 100755..100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php diff --git a/system/database/drivers/index.html b/system/database/drivers/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/index.html +++ b/system/database/drivers/index.html diff --git a/system/database/drivers/mssql/index.html b/system/database/drivers/mssql/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/mssql/index.html +++ b/system/database/drivers/mssql/index.html diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index b39bd9360..b39bd9360 100755..100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index 70b20ecf8..70b20ecf8 100755..100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index 2897ca5a5..2897ca5a5 100755..100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index 48ecbc72a..48ecbc72a 100755..100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php diff --git a/system/database/drivers/mysql/index.html b/system/database/drivers/mysql/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/mysql/index.html +++ b/system/database/drivers/mysql/index.html diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index f87cfea4b..f87cfea4b 100755..100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index c1cae136c..c1cae136c 100755..100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index e1a6e93ca..e1a6e93ca 100755..100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index 48c4d6316..48c4d6316 100755..100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/mysqli/index.html +++ b/system/database/drivers/mysqli/index.html diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index d3200f328..d3200f328 100755..100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index 260549457..260549457 100755..100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 124d4e599..124d4e599 100755..100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index e17889b8c..e17889b8c 100755..100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php diff --git a/system/database/drivers/oci8/index.html b/system/database/drivers/oci8/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/oci8/index.html +++ b/system/database/drivers/oci8/index.html diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 930177e62..930177e62 100755..100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 3cd17585a..3cd17585a 100755..100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 3421278a5..3421278a5 100755..100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index 854b467e1..854b467e1 100755..100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php diff --git a/system/database/drivers/odbc/index.html b/system/database/drivers/odbc/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/odbc/index.html +++ b/system/database/drivers/odbc/index.html diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index bcd7937d9..bcd7937d9 100755..100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 3ec86b4e9..3ec86b4e9 100755..100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index 5d64a464f..5d64a464f 100755..100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index d335bed99..d335bed99 100755..100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php diff --git a/system/database/drivers/postgre/index.html b/system/database/drivers/postgre/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/postgre/index.html +++ b/system/database/drivers/postgre/index.html diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 5367f9759..5367f9759 100755..100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index 91a1c6861..91a1c6861 100755..100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index e9a1d1607..e9a1d1607 100755..100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php index 741c52ea8..741c52ea8 100755..100644 --- a/system/database/drivers/postgre/postgre_utility.php +++ b/system/database/drivers/postgre/postgre_utility.php diff --git a/system/database/drivers/sqlite/index.html b/system/database/drivers/sqlite/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/drivers/sqlite/index.html +++ b/system/database/drivers/sqlite/index.html diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 0cc898b38..0cc898b38 100755..100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 56904082e..56904082e 100755..100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index 7bd30db7c..7bd30db7c 100755..100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index 508023e2f..508023e2f 100755..100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php diff --git a/system/database/index.html b/system/database/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/database/index.html +++ b/system/database/index.html diff --git a/system/fonts/index.html b/system/fonts/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/fonts/index.html +++ b/system/fonts/index.html diff --git a/system/fonts/texb.ttf b/system/fonts/texb.ttf Binary files differindex 383c88b86..383c88b86 100755..100644 --- a/system/fonts/texb.ttf +++ b/system/fonts/texb.ttf diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php index 075a31fdf..075a31fdf 100755..100644 --- a/system/helpers/array_helper.php +++ b/system/helpers/array_helper.php diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php index 19ec0c778..19ec0c778 100755..100644 --- a/system/helpers/captcha_helper.php +++ b/system/helpers/captcha_helper.php diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index 7cee02827..7cee02827 100755..100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 0aeb7fafb..0aeb7fafb 100755..100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index 38347fa62..38347fa62 100755..100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 1145688ae..1145688ae 100755..100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php index 651aef439..651aef439 100755..100644 --- a/system/helpers/email_helper.php +++ b/system/helpers/email_helper.php diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 3931667fd..3931667fd 100755..100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 8733ae053..8733ae053 100755..100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index b64b60650..b64b60650 100755..100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php diff --git a/system/helpers/index.html b/system/helpers/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/helpers/index.html +++ b/system/helpers/index.html diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index 7b99bc5b4..7b99bc5b4 100755..100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php index ac0d69da1..ac0d69da1 100755..100644 --- a/system/helpers/language_helper.php +++ b/system/helpers/language_helper.php diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php index 611777559..611777559 100755..100644 --- a/system/helpers/number_helper.php +++ b/system/helpers/number_helper.php diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php index ffcf46842..ffcf46842 100755..100644 --- a/system/helpers/path_helper.php +++ b/system/helpers/path_helper.php diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php index 678dac821..678dac821 100755..100644 --- a/system/helpers/security_helper.php +++ b/system/helpers/security_helper.php diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 6d8889354..6d8889354 100755..100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 9fa69f46c..9fa69f46c 100755..100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 33d7fa2fd..33d7fa2fd 100755..100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 19b4eec03..19b4eec03 100755..100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index f1e8c6ac6..f1e8c6ac6 100755..100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php index cdd81ad70..cdd81ad70 100755..100644 --- a/system/helpers/xml_helper.php +++ b/system/helpers/xml_helper.php diff --git a/system/index.html b/system/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/index.html +++ b/system/index.html diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php index 3e6312361..3e6312361 100755..100644 --- a/system/language/english/calendar_lang.php +++ b/system/language/english/calendar_lang.php diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php index c0ace16ef..c0ace16ef 100755..100644 --- a/system/language/english/date_lang.php +++ b/system/language/english/date_lang.php diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php index 79b82c73a..79b82c73a 100755..100644 --- a/system/language/english/db_lang.php +++ b/system/language/english/db_lang.php diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index e3bd113cb..e3bd113cb 100755..100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 3418f29ab..3418f29ab 100755..100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index 1e5168cf8..1e5168cf8 100755..100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php index 66505da07..66505da07 100755..100644 --- a/system/language/english/imglib_lang.php +++ b/system/language/english/imglib_lang.php diff --git a/system/language/english/index.html b/system/language/english/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/language/english/index.html +++ b/system/language/english/index.html diff --git a/system/language/english/number_lang.php b/system/language/english/number_lang.php index 908580914..908580914 100755..100644 --- a/system/language/english/number_lang.php +++ b/system/language/english/number_lang.php diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index 1111158c8..1111158c8 100755..100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php index 070bcd1f2..070bcd1f2 100755..100644 --- a/system/language/english/unit_test_lang.php +++ b/system/language/english/unit_test_lang.php diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php index 4de9e9e74..4de9e9e74 100755..100644 --- a/system/language/english/upload_lang.php +++ b/system/language/english/upload_lang.php diff --git a/system/language/index.html b/system/language/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/language/index.html +++ b/system/language/index.html diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php index 261fc367b..261fc367b 100755..100644 --- a/system/libraries/Cache/Cache.php +++ b/system/libraries/Cache/Cache.php diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php index f750e6cb7..f750e6cb7 100755..100644 --- a/system/libraries/Cache/drivers/Cache_apc.php +++ b/system/libraries/Cache/drivers/Cache_apc.php diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php index b11b5b8fc..b11b5b8fc 100755..100644 --- a/system/libraries/Cache/drivers/Cache_dummy.php +++ b/system/libraries/Cache/drivers/Cache_dummy.php diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php index e515eebf1..e515eebf1 100755..100644 --- a/system/libraries/Cache/drivers/Cache_file.php +++ b/system/libraries/Cache/drivers/Cache_file.php diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php index 747842091..747842091 100755..100644 --- a/system/libraries/Cache/drivers/Cache_memcached.php +++ b/system/libraries/Cache/drivers/Cache_memcached.php diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index df0fd6eeb..df0fd6eeb 100755..100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index da47b5a19..da47b5a19 100755..100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index 4912c4aa7..4912c4aa7 100755..100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 9ec40af9d..d01d5c197 100755..100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1954,7 +1954,7 @@ class CI_Email { } } - $msg .= "<pre>".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>'; + $msg .= "<pre>".htmlspecialchars($this->_header_str)."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>'; return $msg; } diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index b30a8cf0b..b30a8cf0b 100755..100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 9aab5da4b..9aab5da4b 100755..100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index d7a8b3b02..d7a8b3b02 100755..100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 21ec2cb4b..21ec2cb4b 100755..100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index 34e0d7001..34e0d7001 100755..100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 9f1db76ba..9f1db76ba 100755..100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index df2dd7ce3..ffa640ba6 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -220,7 +220,7 @@ class CI_Migration { { if ( ! $migrations = $this->find_migrations()) { - $this->_error_string = $this->line->lang('migration_none_found'); + $this->_error_string = $this->lang->line('migration_none_found'); return false; } diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index cdaacf2d4..cdaacf2d4 100755..100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index d223da020..d223da020 100755..100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 882a82c1f..882a82c1f 100755..100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 891fdd36a..891fdd36a 100755..100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php index 1a657572b..1a657572b 100755..100644 --- a/system/libraries/Sha1.php +++ b/system/libraries/Sha1.php diff --git a/system/libraries/Table.php b/system/libraries/Table.php index def696776..def696776 100755..100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index b0a767822..b0a767822 100755..100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 734cec104..734cec104 100755..100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index 5bd7e801a..5bd7e801a 100755..100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 0e5d73b19..0e5d73b19 100755..100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 0b77a7d42..0b77a7d42 100755..100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index d702e902f..d702e902f 100755..100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index 9cd332147..9cd332147 100755..100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 666327d5c..666327d5c 100755..100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php diff --git a/system/libraries/index.html b/system/libraries/index.html index c942a79ce..c942a79ce 100755..100644 --- a/system/libraries/index.html +++ b/system/libraries/index.html diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php index baab83d25..baab83d25 100755..100644 --- a/system/libraries/javascript/Jquery.php +++ b/system/libraries/javascript/Jquery.php |