From 324ef078dda5a3596444152ba49dd591a61adba6 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 17 May 2012 14:45:25 +0100 Subject: Added upgrade for 2.1.1 and updated version. --- system/core/CodeIgniter.php | 2 +- system/database/drivers/pdo/pdo_driver.php | 2 +- system/database/drivers/pdo/pdo_forge.php | 2 +- system/database/drivers/pdo/pdo_result.php | 2 +- system/database/drivers/pdo/pdo_utility.php | 2 +- system/libraries/Cache/Cache.php | 2 +- system/libraries/Cache/drivers/Cache_apc.php | 2 +- system/libraries/Cache/drivers/Cache_dummy.php | 2 +- system/libraries/Cache/drivers/Cache_file.php | 2 +- system/libraries/Cache/drivers/Cache_memcached.php | 2 +- system/libraries/Cart.php | 2 +- system/libraries/Driver.php | 2 +- system/libraries/Migration.php | 2 +- user_guide/changelog.html | 4 +- user_guide/database/active_record.html | 4 +- user_guide/database/caching.html | 4 +- user_guide/database/call_function.html | 4 +- user_guide/database/configuration.html | 4 +- user_guide/database/connecting.html | 4 +- user_guide/database/examples.html | 4 +- user_guide/database/fields.html | 4 +- user_guide/database/forge.html | 4 +- user_guide/database/helpers.html | 4 +- user_guide/database/index.html | 4 +- user_guide/database/queries.html | 4 +- user_guide/database/results.html | 4 +- user_guide/database/table_data.html | 4 +- user_guide/database/transactions.html | 4 +- user_guide/database/utilities.html | 4 +- user_guide/doc_style/index.html | 4 +- user_guide/doc_style/template.html | 2 +- user_guide/general/alternative_php.html | 4 +- user_guide/general/ancillary_classes.html | 4 +- user_guide/general/autoloader.html | 4 +- user_guide/general/caching.html | 4 +- user_guide/general/cli.html | 4 +- user_guide/general/common_functions.html | 4 +- user_guide/general/controllers.html | 4 +- user_guide/general/core_classes.html | 4 +- user_guide/general/creating_drivers.html | 4 +- user_guide/general/creating_libraries.html | 4 +- user_guide/general/credits.html | 4 +- user_guide/general/drivers.html | 4 +- user_guide/general/environments.html | 4 +- user_guide/general/errors.html | 4 +- user_guide/general/helpers.html | 4 +- user_guide/general/hooks.html | 4 +- user_guide/general/libraries.html | 4 +- user_guide/general/managing_apps.html | 4 +- user_guide/general/models.html | 4 +- user_guide/general/profiling.html | 4 +- user_guide/general/quick_reference.html | 4 +- user_guide/general/requirements.html | 4 +- user_guide/general/reserved_names.html | 4 +- user_guide/general/routing.html | 4 +- user_guide/general/security.html | 4 +- user_guide/general/styleguide.html | 4 +- user_guide/general/urls.html | 4 +- user_guide/general/views.html | 4 +- user_guide/helpers/array_helper.html | 4 +- user_guide/helpers/captcha_helper.html | 4 +- user_guide/helpers/cookie_helper.html | 4 +- user_guide/helpers/date_helper.html | 4 +- user_guide/helpers/directory_helper.html | 4 +- user_guide/helpers/download_helper.html | 4 +- user_guide/helpers/email_helper.html | 4 +- user_guide/helpers/file_helper.html | 4 +- user_guide/helpers/form_helper.html | 4 +- user_guide/helpers/html_helper.html | 4 +- user_guide/helpers/inflector_helper.html | 4 +- user_guide/helpers/language_helper.html | 4 +- user_guide/helpers/number_helper.html | 4 +- user_guide/helpers/path_helper.html | 4 +- user_guide/helpers/security_helper.html | 4 +- user_guide/helpers/smiley_helper.html | 4 +- user_guide/helpers/string_helper.html | 4 +- user_guide/helpers/text_helper.html | 4 +- user_guide/helpers/typography_helper.html | 4 +- user_guide/helpers/url_helper.html | 4 +- user_guide/helpers/xml_helper.html | 4 +- user_guide/index.html | 4 +- user_guide/installation/downloads.html | 16 ++-- user_guide/installation/index.html | 4 +- user_guide/installation/troubleshooting.html | 4 +- user_guide/installation/upgrade_120.html | 4 +- user_guide/installation/upgrade_130.html | 4 +- user_guide/installation/upgrade_131.html | 4 +- user_guide/installation/upgrade_132.html | 4 +- user_guide/installation/upgrade_133.html | 4 +- user_guide/installation/upgrade_140.html | 4 +- user_guide/installation/upgrade_141.html | 4 +- user_guide/installation/upgrade_150.html | 4 +- user_guide/installation/upgrade_152.html | 4 +- user_guide/installation/upgrade_153.html | 4 +- user_guide/installation/upgrade_154.html | 4 +- user_guide/installation/upgrade_160.html | 4 +- user_guide/installation/upgrade_161.html | 4 +- user_guide/installation/upgrade_162.html | 4 +- user_guide/installation/upgrade_163.html | 4 +- user_guide/installation/upgrade_170.html | 4 +- user_guide/installation/upgrade_171.html | 4 +- user_guide/installation/upgrade_172.html | 4 +- user_guide/installation/upgrade_200.html | 4 +- user_guide/installation/upgrade_201.html | 4 +- user_guide/installation/upgrade_202.html | 4 +- user_guide/installation/upgrade_203.html | 4 +- user_guide/installation/upgrade_210.html | 4 +- user_guide/installation/upgrade_211.html | 89 ++++++++++++++++++++++ user_guide/installation/upgrade_b11.html | 4 +- user_guide/installation/upgrading.html | 5 +- user_guide/libraries/benchmark.html | 4 +- user_guide/libraries/caching.html | 4 +- user_guide/libraries/calendar.html | 4 +- user_guide/libraries/cart.html | 4 +- user_guide/libraries/config.html | 4 +- user_guide/libraries/email.html | 4 +- user_guide/libraries/encryption.html | 4 +- user_guide/libraries/file_uploading.html | 4 +- user_guide/libraries/form_validation.html | 4 +- user_guide/libraries/ftp.html | 4 +- user_guide/libraries/image_lib.html | 4 +- user_guide/libraries/input.html | 4 +- user_guide/libraries/javascript.html | 4 +- user_guide/libraries/language.html | 4 +- user_guide/libraries/loader.html | 4 +- user_guide/libraries/migration.html | 4 +- user_guide/libraries/output.html | 4 +- user_guide/libraries/pagination.html | 4 +- user_guide/libraries/parser.html | 4 +- user_guide/libraries/security.html | 4 +- user_guide/libraries/sessions.html | 4 +- user_guide/libraries/table.html | 4 +- user_guide/libraries/trackback.html | 4 +- user_guide/libraries/typography.html | 4 +- user_guide/libraries/unit_testing.html | 4 +- user_guide/libraries/uri.html | 4 +- user_guide/libraries/user_agent.html | 4 +- user_guide/libraries/xmlrpc.html | 4 +- user_guide/libraries/zip.html | 4 +- user_guide/license.html | 4 +- user_guide/overview/appflow.html | 4 +- user_guide/overview/at_a_glance.html | 4 +- user_guide/overview/cheatsheets.html | 4 +- user_guide/overview/features.html | 4 +- user_guide/overview/getting_started.html | 4 +- user_guide/overview/goals.html | 4 +- user_guide/overview/index.html | 4 +- user_guide/overview/mvc.html | 4 +- user_guide/toc.html | 4 +- user_guide/tutorial/conclusion.html | 4 +- user_guide/tutorial/create_news_items.html | 4 +- user_guide/tutorial/hard_coded_pages.html | 4 +- user_guide/tutorial/index.html | 4 +- user_guide/tutorial/news_section.html | 4 +- user_guide/tutorial/static_pages.html | 4 +- 155 files changed, 391 insertions(+), 299 deletions(-) create mode 100644 user_guide/installation/upgrade_211.html diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index db1aee574..ec7294102 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -33,7 +33,7 @@ * @var string * */ - define('CI_VERSION', '2.1.0'); + define('CI_VERSION', '2.1.1'); /** * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 5de2079bb..4fc65aeb4 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.0 + * @since Version 2.1.1 * @filesource */ diff --git a/system/database/drivers/pdo/pdo_forge.php b/system/database/drivers/pdo/pdo_forge.php index 1462e8c21..1a076d4a2 100644 --- a/system/database/drivers/pdo/pdo_forge.php +++ b/system/database/drivers/pdo/pdo_forge.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.0 + * @since Version 2.1.1 * @filesource */ diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php index 7f3058ff0..7c4a2f977 100644 --- a/system/database/drivers/pdo/pdo_result.php +++ b/system/database/drivers/pdo/pdo_result.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.0 + * @since Version 2.1.1 * @filesource */ diff --git a/system/database/drivers/pdo/pdo_utility.php b/system/database/drivers/pdo/pdo_utility.php index 29aefca80..fec276458 100644 --- a/system/database/drivers/pdo/pdo_utility.php +++ b/system/database/drivers/pdo/pdo_utility.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.0 + * @since Version 2.1.1 * @filesource */ diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php index 61e7aa761..261fc367b 100644 --- a/system/libraries/Cache/Cache.php +++ b/system/libraries/Cache/Cache.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php index 79d91b320..f750e6cb7 100644 --- a/system/libraries/Cache/drivers/Cache_apc.php +++ b/system/libraries/Cache/drivers/Cache_apc.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php index f96a68e27..b11b5b8fc 100644 --- a/system/libraries/Cache/drivers/Cache_dummy.php +++ b/system/libraries/Cache/drivers/Cache_dummy.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php index 13e2d1af6..c50043660 100644 --- a/system/libraries/Cache/drivers/Cache_file.php +++ b/system/libraries/Cache/drivers/Cache_file.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php index fc586e025..747842091 100644 --- a/system/libraries/Cache/drivers/Cache_memcached.php +++ b/system/libraries/Cache/drivers/Cache_memcached.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index ab5a70c98..da47b5a19 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index 9881c1eec..f9959ff81 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2006 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index 3943ec130..5a41377ea 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2006 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 55fbceeaf..d8fa374cb 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -58,7 +58,7 @@ Change Log

Change Log

Version 2.1.1

-

Release Date: not yet released

+

Release Date: May 18, 2012

-- cgit v1.2.3-24-g4f1b From 9edcacd22ada577c88d82d911b2157e8f0f6a928 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 13 Jun 2012 21:59:33 +0300 Subject: Switch strstr() arguments --- system/database/DB_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index c71a6aa3a..dcaeb5a9b 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1269,7 +1269,7 @@ class CI_DB_driver { // Basically we remove everything to the right of the first space if (strpos($item, ' ') !== FALSE) { - $alias = strstr(' ', $item); + $alias = strstr($item, ' '); $item = substr($item, 0, - strlen($alias)); } else -- cgit v1.2.3-24-g4f1b From ea6cbe026b73be13dd853d710b9609e3faf50f44 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 13 Jun 2012 23:37:04 +0300 Subject: Revert a preg_replace() --- system/database/DB_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index dcaeb5a9b..775fd3354 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1263,7 +1263,7 @@ class CI_DB_driver { } // Convert tabs or multiple spaces into single spaces - $item = preg_replace('/\s+/', ' ', $item); + $item = preg_replace('/[\t ]+/', ' ', $item); // If the item has an alias declaration we remove it and set it aside. // Basically we remove everything to the right of the first space -- cgit v1.2.3-24-g4f1b From 9f9fe824a0f687f5a1e9ed2e6fbaba92f90480d1 Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Tue, 24 Apr 2012 15:17:14 -0400 Subject: Updating XSS cleaning to better handle base64 encoded attributes. Conflicts: system/core/Security.php --- system/core/Security.php | 151 +++++++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 70 deletions(-) diff --git a/system/core/Security.php b/system/core/Security.php index 6f5ac1ed8..7af240ded 100755 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -1,4 +1,4 @@ - '[removed]', - 'document.write' => '[removed]', - '.parentNode' => '[removed]', - '.innerHTML' => '[removed]', - 'window.location' => '[removed]', - '-moz-binding' => '[removed]', - '' => '-->', - ' '<![CDATA[', - '' => '<comment>' + 'document.cookie' => '[removed]', + 'document.write' => '[removed]', + '.parentNode' => '[removed]', + '.innerHTML' => '[removed]', + 'window.location' => '[removed]', + '-moz-binding' => '[removed]', + '' => '-->', + ' '<![CDATA[', + '' => '<comment>' ); /* never allowed, regex replacement */ @@ -89,10 +89,11 @@ class CI_Security { * @access protected */ protected $_never_allowed_regex = array( - "javascript\s*:" => '[removed]', - "expression\s*(\(|&\#40;)" => '[removed]', // CSS and IE - "vbscript\s*:" => '[removed]', // IE, surprise! - "Redirect\s+302" => '[removed]' + 'javascript\s*:', + 'expression\s*(\(|&\#40;)', // CSS and IE + 'vbscript\s*:', // IE, surprise! + 'Redirect\s+302', + "([\"'])?data\s*:[^\\1]*?base64[^\\1]*?,[^\\1]*?\\1?" ); /** @@ -364,9 +365,9 @@ class CI_Security { * These words are compacted back to their correct state. */ $words = array( - 'javascript', 'expression', 'vbscript', 'script', - 'applet', 'alert', 'document', 'write', 'cookie', 'window' - ); + 'javascript', 'expression', 'vbscript', 'script', 'base64', + 'applet', 'alert', 'document', 'write', 'cookie', 'window' + ); foreach ($words as $word) { @@ -524,38 +525,38 @@ class CI_Security { public function sanitize_filename($str, $relative_path = FALSE) { $bad = array( - "../", - "", - "<", - ">", - "'", - '"', - '&', - '$', - '#', - '{', - '}', - '[', - ']', - '=', - ';', - '?', - "%20", - "%22", - "%3c", // < - "%253c", // < - "%3e", // > - "%0e", // > - "%28", // ( - "%29", // ) - "%2528", // ( - "%26", // & - "%24", // $ - "%3f", // ? - "%3b", // ; - "%3d" // = - ); + "../", + "", + "<", + ">", + "'", + '"', + '&', + '$', + '#', + '{', + '}', + '[', + ']', + '=', + ';', + '?', + "%20", + "%22", + "%3c", // < + "%253c", // < + "%3e", // > + "%0e", // > + "%28", // ( + "%29", // ) + "%2528", // ( + "%26", // & + "%24", // $ + "%3f", // ? + "%3b", // ; + "%3d" // = + ); if ( ! $relative_path) { @@ -613,19 +614,20 @@ class CI_Security { */ unset($evil_attributes[array_search('xmlns', $evil_attributes)]); } - + do { $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); - + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/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); @@ -637,11 +639,11 @@ 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$2$4$5', $str, -1, $count); + $str = preg_replace("/<(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(".implode('|', $attribs).")(.*?)([\s><])([><]*)/i", '<$1 $3$5$6$7', $str, -1, $count); } - + } while ($count); - + return $str; } @@ -682,9 +684,15 @@ class CI_Security { */ protected function _js_link_removal($match) { - $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - - return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|livescript\:|mocha\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])) + ), + $match[0] + ); } // -------------------------------------------------------------------- @@ -702,9 +710,15 @@ class CI_Security { */ protected function _js_img_removal($match) { - $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - - return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|livescript\:|mocha\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])) + ), + $match[0] + ); } // -------------------------------------------------------------------- @@ -819,14 +833,11 @@ class CI_Security { */ protected function _do_never_allowed($str) { - foreach ($this->_never_allowed_str as $key => $val) - { - $str = str_replace($key, $val, $str); - } + $str = str_replace(array_keys($this->_never_allowed_str), $this->_never_allowed_str, $str); - foreach ($this->_never_allowed_regex as $key => $val) + foreach ($this->_never_allowed_regex as $regex) { - $str = preg_replace("#".$key."#i", $val, $str); + $str = preg_replace('#'.$regex.'#is', '[removed]', $str); } return $str; -- cgit v1.2.3-24-g4f1b From c955acfe23f25efa0b64596cb463893aff4f11d7 Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Fri, 29 Jun 2012 17:17:52 -0400 Subject: Bumping version number to 2.1.2. --- system/core/CodeIgniter.php | 2 +- system/database/drivers/pdo/pdo_driver.php | 2 +- system/database/drivers/pdo/pdo_forge.php | 2 +- system/database/drivers/pdo/pdo_result.php | 2 +- system/database/drivers/pdo/pdo_utility.php | 2 +- user_guide/changelog.html | 13 ++++- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/cli.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_drivers.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/drivers.html | 2 +- user_guide/general/environments.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/styleguide.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/captcha_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 5 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_170.html | 2 +- user_guide/installation/upgrade_171.html | 2 +- user_guide/installation/upgrade_172.html | 2 +- user_guide/installation/upgrade_200.html | 2 +- user_guide/installation/upgrade_201.html | 2 +- user_guide/installation/upgrade_202.html | 2 +- user_guide/installation/upgrade_203.html | 2 +- user_guide/installation/upgrade_210.html | 2 +- user_guide/installation/upgrade_211.html | 2 +- user_guide/installation/upgrade_212.html | 84 ++++++++++++++++++++++++++++ user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 1 + user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/caching.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/migration.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/security.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- user_guide/tutorial/conclusion.html | 2 +- user_guide/tutorial/create_news_items.html | 2 +- user_guide/tutorial/hard_coded_pages.html | 2 +- user_guide/tutorial/index.html | 2 +- user_guide/tutorial/news_section.html | 2 +- user_guide/tutorial/static_pages.html | 2 +- 147 files changed, 243 insertions(+), 146 deletions(-) create mode 100644 user_guide/installation/upgrade_212.html diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index ec7294102..cd3333331 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -33,7 +33,7 @@ * @var string * */ - define('CI_VERSION', '2.1.1'); + define('CI_VERSION', '2.1.2'); /** * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 654074cd1..1ecc90a82 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.1 + * @since Version 2.1.2 * @filesource */ diff --git a/system/database/drivers/pdo/pdo_forge.php b/system/database/drivers/pdo/pdo_forge.php index 1a076d4a2..9a7822080 100644 --- a/system/database/drivers/pdo/pdo_forge.php +++ b/system/database/drivers/pdo/pdo_forge.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.1 + * @since Version 2.1.2 * @filesource */ diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php index 650b5f98d..a366a5f12 100644 --- a/system/database/drivers/pdo/pdo_result.php +++ b/system/database/drivers/pdo/pdo_result.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.1 + * @since Version 2.1.2 * @filesource */ diff --git a/system/database/drivers/pdo/pdo_utility.php b/system/database/drivers/pdo/pdo_utility.php index fec276458..88ce033aa 100644 --- a/system/database/drivers/pdo/pdo_utility.php +++ b/system/database/drivers/pdo/pdo_utility.php @@ -9,7 +9,7 @@ * @license http://codeigniter.com/user_guide/license.html * @author EllisLab Dev Team * @link http://codeigniter.com - * @since Version 2.1.1 + * @since Version 2.1.2 * @filesource */ diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 56fdba68a..a8f69af36 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
@@ -57,6 +57,17 @@ Change Log

Change Log

+

Version 2.1.2

+

Release Date: June 29, 2012

+ +
    +
  • General Changes +
      +
    • Improved security in xss_clean().
      • +
    +
    • +
+

Version 2.1.1

Release Date: June 12, 2012

diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 734b28411..4f30a012a 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 6cf6ebd98..4ea64397e 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index b28a05050..375c29335 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 01a28c0b5..08286f732 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 531f6a104..4e8cb6242 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 1a1d71be6..de3cda09a 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 546a4ca1f..9cef9a58e 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index e6153721d..22880c5b0 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index db03de1e9..3d1737b0b 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 2a08f0a69..b70118216 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 263752f52..6197b7496 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 395714073..b35ca3ee1 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 5ebe368d8..c38784354 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 53e667046..ed0b49cab 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 4a3005f9f..cb569d451 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index ad5c65a5b..05d02ff1b 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 6d2165fda..b2fad6926 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 9c209c0b7..492020763 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index fdc02e906..0f173f31c 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 5ccc79190..ae22e75a5 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index e21d1de51..d0191078b 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index ac2ff529b..c1c3e01d2 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index ee482e512..f3c2029f6 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index ae43eef27..766a557ff 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index eaa626566..bd0268ae9 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 977cfae4d..5d0e43b08 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 90e7d0306..e795590ee 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 9ea7df6b6..ba87b294f 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 38285a662..86506412c 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 3f0830419..a83173324 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 099430bea..5b13785ad 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 70fb9648e..f46e418f4 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 648b6cba9..3f93b1f4c 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 97312a01e..977bf36da 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/models.html b/user_guide/general/models.html index a416a80d9..a49c27c62 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index b6d5721fd..15a64877f 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 1eb78992b..008307b9c 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 230ab7809..fffb457f3 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 80df6fd11..29ae1de4f 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index e2252e028..839f9d3be 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/security.html b/user_guide/general/security.html index b91266f92..bf6879ddc 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 3ca16496b..b0000aa58 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index d5d85df8a..a6c4cd634 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 68686e1e6..c2685ff3e 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 9b7a90b85..78037fdfc 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index d6b46fdc0..9f1a59992 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index beba67a96..b5e47f6e1 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index f39971a0c..902ec3355 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index c5ac082cd..7cab0b166 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index b669202ad..7054fbabf 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index ae8d2da0e..00af99a09 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 3302cd048..22a34f99d 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 02952b679..a8348c09b 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 6ade2d137..f778d9f5e 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index d441ca1eb..17db82d6c 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 9761b96b7..42e90a4a7 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 8dd9287a8..c16cdcfe8 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 04826bb19..1ecb6d201 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index b05d8e076..3876c0070 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 3441cd8a3..1abcbfc51 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index d4023841d..f70fd6f73 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 775ded677..316fbafbd 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 16e3ca989..fb4d98632 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 488078c39..fbd47b048 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index ce037c251..60671ad3e 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/index.html b/user_guide/index.html index b7ae61887..ededb3a5a 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 12252ad47..1d6bf5b53 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.1

CodeIgniter User Guide Version 2.1.2
@@ -58,7 +58,8 @@ Downloading CodeIgniter

Downloading CodeIgniter

    -
  • CodeIgniter V 2.1.1 (Current version)
    • +
  • CodeIgniter V 2.1.2 (Current version)
    • +
  • CodeIgniter V 2.1.1
  • CodeIgniter V 2.1.0
  • CodeIgniter V 2.0.3
  • CodeIgniter V 2.0.2
    • diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index aca760ca4..d89c8f028 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index bb7cadeba..33ef24a2b 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index b80c02ad9..1f4de9df6 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 3a335738e..3a1c7dbc5 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 4a91c6ceb..6fbb9e5fb 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 1763f2b9c..dfebc2265 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index fd1887d0e..159a6a18e 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index d82472551..3a8aba555 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 3ed11e7b5..2e574866d 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 5909a463a..b6342c5a9 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index f46aee967..c907cf567 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 3d28c6c77..c8434bb36 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index d8dffc99d..dd1666794 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index b90a2e370..6babba9aa 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 69bf84893..cc6323b01 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 270507c59..3d010178d 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 35e7f5c52..3875b1330 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 3a7943905..494d9b4bd 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 43710d444..97e8caef7 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 1882da712..4567c1005 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index fb4fdaf71..6427e9fbd 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 16177e940..7a1aa4083 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index a0d787115..ab5828ef1 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index 0969164df..8ebcf8b9b 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index 7c34806e7..9e0357cb7 100644 --- a/user_guide/installation/upgrade_210.html +++ b/user_guide/installation/upgrade_210.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index 92b5faab1..5a377d1a0 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrade_212.html b/user_guide/installation/upgrade_212.html new file mode 100644 index 000000000..00f0bcbc6 --- /dev/null +++ b/user_guide/installation/upgrade_212.html @@ -0,0 +1,84 @@ + + + + + +Upgrading from 2.1.1 to 2.1.2 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 2.1.2

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 2.1.1 to 2.1.2

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + +

    Step 1: Update your CodeIgniter files

    + +

    Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 0e52aa601..d315b14da 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.1

    CodeIgniter User Guide Version 2.1.2
    diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 1c8be9025..4e159f5e2 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@ Upgrading from a Previous Version

    Please read the upgrade notes corresponding to the version you are upgrading from.

      +
    • Upgrading from 2.1.1 to 2.1.2
    • Upgrading from 2.1.0 to 2.1.1
    • Upgrading from 2.0.3 to 2.1.0
    • Upgrading from 2.0.2 to 2.0.3
      • diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 55592857a..688950d44 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index a818fe807..9211fb1a7 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index ac0c8252a..d0d1d6128 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index c10ab4488..8c78b0825 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index a689bd5cf..38cdab5cb 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index e418d528d..53fdb54ad 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 935e0bfa0..57643c243 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 2ada111ab..6e137e3be 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 8d6f3b6d2..f00b93a13 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 8cf60893e..b287d2bc0 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 8df6976e1..20f630cbe 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index e199c58dd..38f2d5cbc 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 6b72ed6c2..673794505 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 44a4cb654..38267b9e8 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 862430b9f..bd9753f48 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index 646772198..703011e20 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index cf2324bd8..3fffb7c0d 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 54c7efcc2..ac3403e04 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 4d909223c..4106686a7 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 25f1fe879..e9a8fcac0 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index bfffa0b2f..6a6555e6a 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 1c46b5fac..5d07a13c6 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index f77937a9b..1725b6482 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 81c244790..becd87af5 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index df1748e5c..a9a52a1b0 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index f333199ac..f7cfe8ded 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 829fdba03..305f434e7 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index ad714efbf..965d30ac4 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 3324bd16c..81ca1fa28 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/license.html b/user_guide/license.html index bc25c30b4..89e9e0563 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index a59758f0b..013d13456 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 18688d34f..685dfc461 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 005890a55..f639562a1 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index c97044414..2881dcbe5 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 8d8a8af35..5c81fb14a 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 0d2eeb5c9..e26df787b 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 732a245ff..49819e5df 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 989ad7afb..ac85ef2c8 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/toc.html b/user_guide/toc.html index 07bfbd234..2f1ea5e4e 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index b4a1e0005..349a88b08 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 9afeed9ec..be82e7897 100644 --- a/user_guide/tutorial/create_news_items.html +++ b/user_guide/tutorial/create_news_items.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html index 354dcb0e6..10022737c 100644 --- a/user_guide/tutorial/hard_coded_pages.html +++ b/user_guide/tutorial/hard_coded_pages.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index d3392669e..c37f40353 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index 1cb67c66e..c93831d7e 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index a7112f362..6a554bbff 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.1

      CodeIgniter User Guide Version 2.1.2
      -- cgit v1.2.3-24-g4f1b