From 8a35e1df41a2ec36fc5b6e6176f441d65e55756a Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Mon, 15 Jul 2013 10:44:06 -0400 Subject: Correcting URL for search box. --- user_guide/changelog.html | 2 +- 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 | 2 +- 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 | 2 +- user_guide/installation/upgrade_213.html | 2 +- user_guide/installation/upgrade_214.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- 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 +- 144 files changed, 144 insertions(+), 144 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5c8bf3649..42472176c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -44,7 +44,7 @@ User Guide Home  ›  Change Log -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index e88a31485..5a31be2db 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -44,7 +44,7 @@ Database Library  ›  Active Record -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 21325ec3a..771f99378 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -45,7 +45,7 @@ Database Library  ›  Database Caching Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 6da549288..35b5d3a3a 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -45,7 +45,7 @@ Database Library  ›  Custom Function Calls -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index f4caf176a..6c3d7a123 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -45,7 +45,7 @@ Database Library  ›  Configuration -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index ca58eb901..679fb0b8e 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -45,7 +45,7 @@ Database Library  ›  Connecting -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 6e86db205..c130e8ac2 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -46,7 +46,7 @@ Database Library  ›  Database Example Code -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 538df927d..da38810ac 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -44,7 +44,7 @@ Database Library  ›  Field Names -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index df1129007..99e01fb12 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -45,7 +45,7 @@ Database Library  ›  Database Forge Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index f7e9081ee..02d08effc 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -45,7 +45,7 @@ Database Library  ›  Query Helpers -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/index.html b/user_guide/database/index.html index ae696c41d..3bfcba48e 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -44,7 +44,7 @@ User Guide Home  ›  Database Library -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 1ba4b69ae..63eb0c0e7 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -45,7 +45,7 @@ Database Library  ›  Queries -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 53d6e61d1..1b7d95701 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -45,7 +45,7 @@ Database Library  ›  Query Results -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 383cae273..53b8b7723 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -45,7 +45,7 @@ Database Library  ›  Table Data -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index dc7fb98f3..21bfd4fc2 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -46,7 +46,7 @@ Database Library  ›  Transactions -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 3441c45f7..cf2b00c99 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -45,7 +45,7 @@ Database Library  ›  Database Utility Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 665085f93..2de0dd66a 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -44,7 +44,7 @@ User Guide Home  ›  Writing Documentation -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 19dc816af..c62fef9f9 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -44,7 +44,7 @@ User Guide Home  ›  Alternate PHP Syntax -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 2fa18e75d..c1ea33cf2 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -44,7 +44,7 @@ User Guide Home  ›  Creating Ancillary Classes -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 220471f8d..764b42e57 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -44,7 +44,7 @@ User Guide Home  ›  Auto-loading Resources -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 9f1fef5d6..af671fb85 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -44,7 +44,7 @@ User Guide Home  ›  Page Caching -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 82116ce92..658754fe8 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -44,7 +44,7 @@ User Guide Home  ›  Running via the CLI -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index f19f10e59..b3f4f3202 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -44,7 +44,7 @@ User Guide Home  ›  Auto-loading Resources -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 8610abe64..760042364 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -44,7 +44,7 @@ User Guide Home  ›  Controllers -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 60b4407bf..8cd159fc8 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -44,7 +44,7 @@ User Guide Home  ›  Creating Core System Classes -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 2393da72b..46a41f0a2 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -44,7 +44,7 @@ User Guide Home  ›  Creating Drivers -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index e789f9317..0d424a2e0 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -44,7 +44,7 @@ User Guide Home  ›  Creating Libraries -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 3a2e238b6..67a461f65 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -44,7 +44,7 @@ User Guide Home  ›  Credits -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index a5479fdde..b2f91cebe 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -44,7 +44,7 @@ User Guide Home  ›  Using CodeIgniter Drivers -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 2b21267a0..25190a5d3 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -44,7 +44,7 @@ User Guide Home  ›  Handling Multiple Environments -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index b52cde943..6764b5447 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -44,7 +44,7 @@ User Guide Home  ›  Error Handling -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index d63c745a7..0614dcba0 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -44,7 +44,7 @@ User Guide Home  ›  Helper Functions -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 02936003c..c75f45d0a 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -44,7 +44,7 @@ User Guide Home  ›  Hooks - Extending the Framework Core -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index df461e750..6830fb080 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -44,7 +44,7 @@ User Guide Home  ›  Using CodeIgniter Libraries -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 1d7630f67..8f9673673 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -44,7 +44,7 @@ User Guide Home  ›  Managing your Applications -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 5e5a835e6..4fd99844e 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -43,7 +43,7 @@ User Guide Home  ›  Models -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 82e438d57..e333cf59c 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -44,7 +44,7 @@ User Guide Home  ›  Profiling Your Application -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 41708b48e..000568db3 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -44,7 +44,7 @@ User Guide Home  ›  Quick Reference Chart -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index ffa978ad4..9691d207f 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -44,7 +44,7 @@ User Guide Home  ›  Server Requirements -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 3a2149ac6..34306b584 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -44,7 +44,7 @@ User Guide Home  ›  Controllers -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index d47553955..61fe93463 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -44,7 +44,7 @@ User Guide Home  ›  URI Routing -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/security.html b/user_guide/general/security.html index acab22617..1032014ae 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -44,7 +44,7 @@ User Guide Home  ›  Security -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index b27ecafb3..4cd704baf 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -50,7 +50,7 @@ User Guide Home  ›  Style Guide -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 396a339ad..9493eb334 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -44,7 +44,7 @@ User Guide Home  ›  URLS -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 4faf6af66..c4dd6c658 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -44,7 +44,7 @@ User Guide Home  ›  Views -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index db1043f5d..6b0f2159b 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Array Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 0d3e137ac..b67d9ddd5 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  CAPTCHA Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 7391d7398..236f0c477 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Cookie Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 1c6c05a8d..70193b179 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Date Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 933918511..6fb65404f 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -45,7 +45,7 @@ User Guide Home  ›  Directory Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 7c50c19c6..80d48681e 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -45,7 +45,7 @@ User Guide Home  ›  Download Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index eaa73c607..1ec80158d 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -45,7 +45,7 @@ User Guide Home  ›  Email Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 9291431cd..5eb258e1e 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -43,7 +43,7 @@ User Guide Home  ›  File Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 29355093a..2268d4543 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Form Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index b2e418d6c..b594e25ce 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  HTML Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 41efb57dc..e044b34bc 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Inflector Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index afd12a348..2c7df78ec 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -45,7 +45,7 @@ User Guide Home  ›  Language Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index b351c3529..c3e4e46d0 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Number Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 3b3947f58..1a5850e94 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -43,7 +43,7 @@ User Guide Home  ›  Path Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index c97de8e1a..297800f43 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Security Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 046e4fa37..d0b633147 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Smiley Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index c173a1312..e1f31b8db 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  String Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index edce5cb01..2816077af 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Text Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 1882580e8..d072ed156 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  Typography Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index a133dd15f..fd58b43c2 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -43,7 +43,7 @@ User Guide Home  ›  URL Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index aba5806de..3ca9519f7 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -44,7 +44,7 @@ User Guide Home  ›  XML Helper -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/index.html b/user_guide/index.html index 729dcdbab..793a7cade 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -41,7 +41,7 @@ CodeIgniter Home  ›  CodeIgniter User Guide -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 4a0468235..850d0a123 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -44,7 +44,7 @@ User Guide Home  ›  Downloading CodeIgniter -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 93c140921..ff9d83096 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -44,7 +44,7 @@ User Guide Home  ›  Installation Instructions -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 2f9fe9ced..85d9f7f5f 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -44,7 +44,7 @@ User Guide Home  ›  Trouble Shooting -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 070369227..38ede1294 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from Beta 1.1 to Final 1.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 20a6d2b60..f44837782 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.2 to 1.3 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index fe0876e5e..fa123d184 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.3 to 1.3.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 8866f13bd..b0ab815f3 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.3.1 to 1.3.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index b4d46c644..badd6dcaa 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.3.2 to 1.3.3 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 735f050db..339befd57 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.3.3 to 1.4.0 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 64d3f6aba..064fd66fa 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -43,7 +43,7 @@ CodeIgniter Home  ›  User Guide Home  ›  Upgrading from 1.4.0 to 1.4.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 06b8e9a33..c41e1398e 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.4.1 to 1.5.0 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index cb06bfb0d..eb1ec3be9 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.5.0 to 1.5.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index e9e67936f..f26aa8a1e 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -43,7 +43,7 @@ CodeIgniter Home  ›  User Guide Home  › Upgrading from 1.5.2 to 1.5.3 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 322de06bc..d721ff290 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.5.3 to 1.5.4 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index e450b4413..fb11ee303 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.5.4 to 1.6.0 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 58ad35136..7f4035566 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.6.0 to 1.6.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index d093555cd..4237857e6 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.6.1 to 1.6.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 9eb661389..edfa420f3 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.6.2 to 1.6.3 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index a1e75beb8..6fea1da4e 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.6.3 to 1.7.0 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 71d952052..45347be4f 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.7.0 to 1.7.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 4abb0f0fc..cad36b102 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.7.1 to 1.7.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index 307a3a9f8..daf652245 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 1.7.2 to 2.0.0 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 60d5054e4..1b307522d 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.0.0 to 2.0.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index c0ce31dc0..7814de830 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.0.1 to 2.0.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index 2a68fe8e9..4f5870600 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.0.2 to 2.0.3 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index 6c3b02590..16ad69d20 100644 --- a/user_guide/installation/upgrade_210.html +++ b/user_guide/installation/upgrade_210.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.0.3 to 2.1.0 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index 6469fbb71..9480be2d2 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.1.0 to 2.1.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_212.html b/user_guide/installation/upgrade_212.html index 35fde109c..f71e5cf04 100644 --- a/user_guide/installation/upgrade_212.html +++ b/user_guide/installation/upgrade_212.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.1.1 to 2.1.2 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_213.html b/user_guide/installation/upgrade_213.html index 56aabe75c..cd1e48c83 100644 --- a/user_guide/installation/upgrade_213.html +++ b/user_guide/installation/upgrade_213.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.1.2 to 2.1.3 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_214.html b/user_guide/installation/upgrade_214.html index ceeb7537a..6e5dc998e 100644 --- a/user_guide/installation/upgrade_214.html +++ b/user_guide/installation/upgrade_214.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from 2.1.3 to 2.1.4 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 022f381a2..e85d5d2dc 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from Beta 1.0 to Beta 1.1 -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index d4dc975f6..a0c241f19 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -44,7 +44,7 @@ User Guide Home  ›  Upgrading from a Previous Version -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index acf2a6244..5ece98bec 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -44,7 +44,7 @@ User Guide Home  ›  Benchmarking Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index 65aa33728..95ded23c8 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -45,7 +45,7 @@ Drivers  ›  Caching Driver -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index b8ddf624c..b42e22ccb 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -44,7 +44,7 @@ User Guide Home  ›  Calendaring Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 103120453..d0efa5f74 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -44,7 +44,7 @@ User Guide Home  ›  Shopping Cart Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 91b726acb..1fabc9507 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -44,7 +44,7 @@ User Guide Home  ›  Config Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index f407d809f..d286ffead 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -44,7 +44,7 @@ User Guide Home  ›  Email Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index b2fb76961..cd59a6c30 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -44,7 +44,7 @@ User Guide Home  ›  Encryption Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index e34db2f87..9759d0cb2 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -44,7 +44,7 @@ User Guide Home  ›  File Uploading Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index be376e15b..b04dac238 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -43,7 +43,7 @@ User Guide Home  ›  Form Validation -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index efb86dec3..67c0ce75b 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -44,7 +44,7 @@ User Guide Home  ›  FTP Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index c8c2a24e0..4f01bded5 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -44,7 +44,7 @@ User Guide Home  ›  Image Manipulation Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 26ed9c2c8..f5049e1df 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -44,7 +44,7 @@ User Guide Home  ›  Input Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 26ca52f9a..f9d73f2a2 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -45,7 +45,7 @@ Drivers  ›  JavaScript Driver -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 2af1ae7ff..09287ffe1 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -44,7 +44,7 @@ User Guide Home  ›  Language Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index a9ceee0f3..1000ca81c 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -44,7 +44,7 @@ User Guide Home  ›  Loader Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index 721abfb35..018be3044 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -44,7 +44,7 @@ User Guide Home  ›  Migration Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 9f029929b..072a25d2c 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -44,7 +44,7 @@ User Guide Home  ›  Output Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 9df696658..5f1dde410 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -44,7 +44,7 @@ User Guide Home  ›  Pagination Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 63c9c84c6..0f4fce648 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -44,7 +44,7 @@ User Guide Home  ›  Template Parser Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 2e6479a93..8661168f2 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -44,7 +44,7 @@ User Guide Home  ›  Security Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index be81a9ced..1b7b73ab9 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -44,7 +44,7 @@ User Guide Home  ›  Session Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index ccef6c76d..c95149624 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -43,7 +43,7 @@ User Guide Home  ›  HTML Table Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 8f3da779a..e03aad484 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -44,7 +44,7 @@ User Guide Home  ›  Trackback Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 21e636b0a..93e0cd4b6 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -44,7 +44,7 @@ User Guide Home  ›  Typography Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index c8ef0fa2a..553d43909 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -44,7 +44,7 @@ User Guide Home  ›  Unit Testing Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 41980a879..2f4f34bf1 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -44,7 +44,7 @@ User Guide Home  ›  URI Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index b59b9dcb5..c3ff47003 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -44,7 +44,7 @@ User Guide Home  ›  User Agent Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 9a866b1e7..139ba6871 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -44,7 +44,7 @@ User Guide Home  ›  XML-RPC and XML-RPC Server Classes -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 89f147942..0a03653be 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -44,7 +44,7 @@ User Guide Home  ›  Zip Encoding Class -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/license.html b/user_guide/license.html index 3f1c67538..c990aa2a7 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -45,7 +45,7 @@ User Guide Home  ›  License Agreement -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 98aa02d5c..c2004c756 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -44,7 +44,7 @@ User Guide Home  ›  Appflow -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index a74774dff..d51d42c6f 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -44,7 +44,7 @@ User Guide Home  ›  What is CodeIgniter? -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 4a611f746..7284cd741 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -44,7 +44,7 @@ User Guide Home  ›  CodeIgniter Cheatsheets -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index ecaabfcbe..aebafe632 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -44,7 +44,7 @@ User Guide Home  ›  Features -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index a24e77080..049d29cc7 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -44,7 +44,7 @@ User Guide Home  ›  Getting Started -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 49e61126a..ec5a418cf 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -44,7 +44,7 @@ User Guide Home  ›  Goals -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 46b68797b..1f3883980 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -44,7 +44,7 @@ User Guide Home  ›  Introduction -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index e0621c361..1d98c2e54 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -44,7 +44,7 @@ User Guide Home  ›  MVC -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/toc.html b/user_guide/toc.html index 9079dc84a..9c28da3bf 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -45,7 +45,7 @@ User Guide Home  ›  Table of Contents -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index 8ad8fcbbe..a1c9c2487 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -45,7 +45,7 @@ Tutorial  ›  Conclusion -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 0d5fba3b5..4db7fb83e 100644 --- a/user_guide/tutorial/create_news_items.html +++ b/user_guide/tutorial/create_news_items.html @@ -45,7 +45,7 @@ Tutorial  ›  Create news items -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html index 0e32567ad..2b5951f10 100644 --- a/user_guide/tutorial/hard_coded_pages.html +++ b/user_guide/tutorial/hard_coded_pages.html @@ -44,7 +44,7 @@ User Guide Home  ›  Features -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index f117e33c1..d1da60268 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -45,7 +45,7 @@ Tutorial  ›  Introduction -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index e07d4d4e7..f8e64fc36 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -45,7 +45,7 @@ Tutorial  ›  News section -
Search User Guide   
+
Search User Guide   
diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index 15ed01dbc..4b138d74e 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -45,7 +45,7 @@ Tutorial  ›  Static pages -
Search User Guide   
+
Search User Guide   
-- cgit v1.2.3-24-g4f1b From 125a8c5e61b7f8b7c2432cdcb45e43b6572163e4 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 16 Jul 2013 11:06:12 +0300 Subject: Fix changelog errors --- user_guide/changelog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 42472176c..e97b472be 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,8 +73,8 @@ Change Log -- cgit v1.2.3-24-g4f1b From 0266d118a7c3b876af25a34cb2dc5f5991034c6b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 16 Jul 2013 12:31:11 +0300 Subject: Fix download link for latest version --- user_guide/installation/downloads.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 850d0a123..0a2fa8d16 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -58,7 +58,7 @@ Downloading CodeIgniter

Downloading CodeIgniter

    -
  • CodeIgniter V 2.1.4 (Current version)
    • +
  • CodeIgniter V 2.1.4 (Current version)
  • CodeIgniter V 2.1.3
  • CodeIgniter V 2.1.2
  • CodeIgniter V 2.1.1
    • -- cgit v1.2.3-24-g4f1b From db4f429fdbc3e3cdca53f5d9ab1daf5811c5ac19 Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Tue, 16 Jul 2013 10:43:45 -0400 Subject: Fixing download links for old versions. --- user_guide/installation/downloads.html | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 0a2fa8d16..01a4a58b3 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -59,34 +59,34 @@ Downloading CodeIgniter -- cgit v1.2.3-24-g4f1b From dc3ba214cb9d938bb9f310ceaef667af3a34002c Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Mon, 29 Jul 2013 15:54:58 -0400 Subject: Fixing two broken links in the User Guide. --- user_guide/general/quick_reference.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 000568db3..ac1b27ed6 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -57,7 +57,7 @@ Quick Reference Chart

    Quick Reference Chart

    -

    For a PDF version of this chart, click here.

    +

    For a PDF version of this chart, click here.

    diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index d0b633147..3153b7096 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -82,7 +82,7 @@ Your users can click a desired smiley and with the help of some JavaScript it wi

    Here is an example demonstrating how you might create a set of clickable smileys next to a form field. This example requires that you first download and install the smiley images, then create a controller and the View as described.

    -

    Important: Before you begin, please download the smiley images and put them in +

    Important: Before you begin, please download the smiley images and put them in a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at application/config/smileys.php

    -- cgit v1.2.3-24-g4f1b From ef0a95ef4c0e866e3bdb206024f71f0834430b81 Mon Sep 17 00:00:00 2001 From: Chris Hepner Date: Thu, 1 Aug 2013 22:30:52 -0700 Subject: Fixed incorrect documentation for decimal validator --- user_guide/libraries/form_validation.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index b04dac238..a073d88f2 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1022,8 +1022,8 @@ POST array:

    decimal - Yes - Returns FALSE if the form element is not exactly the parameter value. + No + Returns FALSE if the form element contains anything other than a decimal number.   @@ -1247,4 +1247,4 @@ Next Topic:  FTP Class - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From 7da60d95e077df53ed56460903eb68c20c2eba9f Mon Sep 17 00:00:00 2001 From: PlamenVasilev Date: Mon, 5 Aug 2013 13:49:03 +0300 Subject: Suhosin compatible emails Fix problems with Suhosin and sending emails trough php mail() --- system/libraries/Email.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index d01d5c197..ebe7fe4d9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1032,7 +1032,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); $this->_finalbody = $this->_body; } else @@ -1070,7 +1070,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); } else { @@ -1092,7 +1092,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); } $body .= $this->_get_mime_message() . $this->newline . $this->newline; @@ -1110,7 +1110,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); } $body .= $this->_get_mime_message() . $this->newline . $this->newline; -- cgit v1.2.3-24-g4f1b From 508aa787c1203a42d1103617bba122e312bd5088 Mon Sep 17 00:00:00 2001 From: tino Date: Fri, 18 Oct 2013 10:26:05 +0200 Subject: Bugfix on truncate command --- system/database/drivers/sqlsrv/sqlsrv_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 400fd31c6..e6f37778c 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -536,7 +536,7 @@ class CI_DB_sqlsrv_driver extends CI_DB { */ function _truncate($table) { - return "TRUNCATE ".$table; + return "TRUNCATE TABLE ".$table; } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 6f52325abecad238b4c0a3097b0d849bf685adce Mon Sep 17 00:00:00 2001 From: tino Date: Fri, 18 Oct 2013 11:21:47 +0200 Subject: Fix on sqlsrv_forge drop_table --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index cc88ec5ca..d800c5074 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -60,7 +60,14 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _drop_table($table) { - return "DROP TABLE ".$this->db->_escape_identifiers($table); + $sql = ''; + $sql = "IF (EXISTS (SELECT * + FROM INFORMATION_SCHEMA.TABLES + WHERE TABLE_SCHEMA = 'dbo' + AND TABLE_NAME = '"; + $sql .= $this->db->_escape_identifiers($table)."')) DROP TABLE [dbo].["; + $sql .= $this->db->_escape_identifiers($table).']'; + return $sql; } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 1f71da710a84e6bf2d348bd17ffcc7b5023f13c9 Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 15:58:04 +0200 Subject: Style correction --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index d800c5074..2940beb9b 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -61,12 +61,12 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { function _drop_table($table) { $sql = ''; - $sql = "IF (EXISTS (SELECT * - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = '"; - $sql .= $this->db->_escape_identifiers($table)."')) DROP TABLE [dbo].["; - $sql .= $this->db->_escape_identifiers($table).']'; + $sql = "IF (EXISTS (SELECT * + FROM INFORMATION_SCHEMA.TABLES + WHERE TABLE_SCHEMA = 'dbo' + AND TABLE_NAME = '"; + $sql .= $this->db->_escape_identifiers($table)."')) DROP TABLE [dbo].["; + $sql .= $this->db->_escape_identifiers($table).']'; return $sql; } -- cgit v1.2.3-24-g4f1b From 898683f95b1b1344a9475647cfe2af285af5f163 Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 16:08:08 +0200 Subject: removed unnecessary assignment --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index 2940beb9b..a5adcbe95 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -60,7 +60,6 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _drop_table($table) { - $sql = ''; $sql = "IF (EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' -- cgit v1.2.3-24-g4f1b From 84b053906da253dbe2fa63a409c2559f3af8ef69 Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 16:39:58 +0200 Subject: Bugfix on the sqlsrv forge driver create_table function --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index a5adcbe95..289dfa6ab 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -60,13 +60,10 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _drop_table($table) { - $sql = "IF (EXISTS (SELECT * + return = "IF (EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = '"; - $sql .= $this->db->_escape_identifiers($table)."')) DROP TABLE [dbo].["; - $sql .= $this->db->_escape_identifiers($table).']'; - return $sql; + AND TABLE_NAME = '".$table."')) DROP TABLE [dbo].[".$table."]"; } // -------------------------------------------------------------------- @@ -84,14 +81,15 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) { - $sql = 'CREATE TABLE '; - + $sql = ''; if ($if_not_exists === TRUE) { - $sql .= 'IF NOT EXISTS '; + $sql = "IF (NOT EXISTS (SELECT * + FROM INFORMATION_SCHEMA.TABLES + WHERE TABLE_SCHEMA = 'dbo' + AND TABLE_NAME = "; } - - $sql .= $this->db->_escape_identifiers($table)." ("; + $sql .= $this->db->_escape_identifiers($table).")) CREATE TABLE ".$this->db->_escape_identifiers($table)." ("; $current_field_count = 0; foreach ($fields as $field=>$attributes) @@ -137,7 +135,7 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) { - $sql .= ' AUTO_INCREMENT'; + $sql .= ' IDENTITY(1,1)'; } } -- cgit v1.2.3-24-g4f1b From 18d6090a7ead8c93d2513e3b034cd1a994ed3c2f Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 16:42:53 +0200 Subject: Bugfix on the sqlsrv forge driver rename_table function --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index 289dfa6ab..e65e46116 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -241,12 +241,10 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _rename_table($table_name, $new_table_name) { - // I think this syntax will work, but can find little documentation on renaming tables in MSSQL - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; + return 'EXEC sp_rename '.$this->db->_protect_identifiers($table_name).", ".$this->db->_protect_identifiers($new_table_name); } } -/* End of file mssql_forge.php */ -/* Location: ./system/database/drivers/mssql/mssql_forge.php */ \ No newline at end of file +/* End of file sqlsrv_forge.php */ +/* Location: ./system/database/drivers/sqlsrv/sqlsrv_forge.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447 Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 16:46:09 +0200 Subject: Bugfix on the active record join statement with empty conditions --- system/database/DB_active_rec.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 129eaa7b6..5bf0d8f1d 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -336,8 +336,12 @@ class CI_DB_active_record extends CI_DB_driver { $cond = $match[1].$match[2].$match[3]; } - // Assemble the JOIN statement - $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; + // Assemble the JOIN statement: only use ON if a condition was passed + $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE); + if ($cond) + { + $join .= ' ON '.$cond; + } $this->ar_join[] = $join; if ($this->ar_caching === TRUE) -- cgit v1.2.3-24-g4f1b From be4ee57160b51a0640a7c8b460f868f594e06ffc Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 20:14:09 +0200 Subject: Revert "Bugfix on the active record join statement with empty conditions" This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447. --- system/database/DB_active_rec.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 5bf0d8f1d..b1d56b7ec 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -337,11 +337,7 @@ class CI_DB_active_record extends CI_DB_driver { } // Assemble the JOIN statement: only use ON if a condition was passed - $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE); - if ($cond) - { - $join .= ' ON '.$cond; - } + $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; $this->ar_join[] = $join; if ($this->ar_caching === TRUE) -- cgit v1.2.3-24-g4f1b From 149412915c0ab247cbe84420d52940b1c6b0df7a Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 20:14:09 +0200 Subject: Revert "Bugfix on the active record join statement with empty conditions" This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447. --- system/database/DB_active_rec.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 5bf0d8f1d..129eaa7b6 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -336,12 +336,8 @@ class CI_DB_active_record extends CI_DB_driver { $cond = $match[1].$match[2].$match[3]; } - // Assemble the JOIN statement: only use ON if a condition was passed - $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE); - if ($cond) - { - $join .= ' ON '.$cond; - } + // Assemble the JOIN statement + $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; $this->ar_join[] = $join; if ($this->ar_caching === TRUE) -- cgit v1.2.3-24-g4f1b From 3a2cceaa54fd4d55eda5fe07bb428350a08e2288 Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 20:31:46 +0200 Subject: Added changelog entries --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e97b472be..f6384fb1a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,6 +75,7 @@ Change Log
  • Fixed a bug (#2021) - Migrations Library configuration file was mistakenly using Windows style line feeds.
  • Fixed a bug (#1273) - Active Record method set_update_batch() was using the incorrect variables and would cause an error.
  • Fixed a bug (#2337) - Email Library method print_debugger() was not using htmlspecialchars() when being shown in the browser.
    • +
  • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() were incorrect using the sqlsrv driver.
-- cgit v1.2.3-24-g4f1b From 9c5c490bdc61ebd27593577480ec484f0b0f6367 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 5 Dec 2013 12:51:42 +0200 Subject: Fix some spacing issues from PR #2689 --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 13 ++++--------- user_guide/changelog.html | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index e65e46116..286977c52 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -60,10 +60,8 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _drop_table($table) { - return = "IF (EXISTS (SELECT * - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = '".$table."')) DROP TABLE [dbo].[".$table."]"; + return "IF (EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = '" + .$table."')) DROP TABLE [dbo].[".$table."]"; } // -------------------------------------------------------------------- @@ -81,13 +79,10 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) { - $sql = ''; + $sql = ''; if ($if_not_exists === TRUE) { - $sql = "IF (NOT EXISTS (SELECT * - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = "; + $sql = "IF (NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = "; } $sql .= $this->db->_escape_identifiers($table).")) CREATE TABLE ".$this->db->_escape_identifiers($table)." ("; $current_field_count = 0; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f6384fb1a..aebf52580 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,7 +75,7 @@ Change Log
  • Fixed a bug (#2021) - Migrations Library configuration file was mistakenly using Windows style line feeds.
  • Fixed a bug (#1273) - Active Record method set_update_batch() was using the incorrect variables and would cause an error.
  • Fixed a bug (#2337) - Email Library method print_debugger() was not using htmlspecialchars() when being shown in the browser.
    • -
  • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() were incorrect using the sqlsrv driver.
    • +
  • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() were incorrect using the sqlsrv driver.
    • -- cgit v1.2.3-24-g4f1b From 0433431188b9e71841ae292cb218ca89ded58b87 Mon Sep 17 00:00:00 2001 From: Aaron Krebs Date: Wed, 11 Dec 2013 12:32:23 -0700 Subject: Make oci_execute() calls inside num_rows() non-committing. Fixes #696. Fixes bug in Oracle driver. Calls to oci_execute() inside num_rows() of the Oracle driver can be made non-committing to fix bug with transactions. Since calls to oci_execute are only there to reset which row is next in line for oci_fetch() calls, it's fine to not commit. --- system/database/drivers/oci8/oci8_result.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 3421278a5..f6138c014 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -43,11 +43,11 @@ class CI_DB_oci8_result extends CI_DB_result { if ($this->num_rows === 0 && count($this->result_array()) > 0) { $this->num_rows = count($this->result_array()); - @oci_execute($this->stmt_id); + @oci_execute($this->stmt_id, OCI_DEFAULT); if ($this->curs_id) { - @oci_execute($this->curs_id); + @oci_execute($this->curs_id, OCI_DEFAULT); } } -- cgit v1.2.3-24-g4f1b From 92f62b03812c6079fc5e73d865d727627e533e63 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 7 Jan 2014 15:44:00 +0200 Subject: Manually apply an improved version of PR #2427 --- system/database/drivers/pdo/pdo_driver.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 1ecc90a82..d153af2e7 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -190,14 +190,12 @@ class CI_DB_pdo_driver extends CI_DB { { $sql = $this->_prep_query($sql); $result_id = $this->conn_id->prepare($sql); - $result_id->execute(); - - if (is_object($result_id)) + + if (is_object($result_id) && ($result = $result_id->execute())) { if (is_numeric(stripos($sql, 'SELECT'))) { $this->affect_rows = count($result_id->fetchAll()); - $result_id->execute(); } else { @@ -207,9 +205,10 @@ class CI_DB_pdo_driver extends CI_DB { else { $this->affect_rows = 0; + $result = FALSE; } - - return $result_id; + + return $result; } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 3708f071b3db08c969ec1eb2c17a56c56ddd6144 Mon Sep 17 00:00:00 2001 From: Ender Teszla Date: Thu, 27 Feb 2014 22:56:23 +0400 Subject: Deleted useless .htaccess file, added missed index.html files. --- application/cache/.htaccess | 1 - application/language/index.html | 10 ++++++++++ system/libraries/Cache/drivers/index.html | 10 ++++++++++ system/libraries/Cache/index.html | 10 ++++++++++ system/libraries/javascript/index.html | 10 ++++++++++ 5 files changed, 40 insertions(+), 1 deletion(-) delete mode 100644 application/cache/.htaccess create mode 100644 application/language/index.html create mode 100644 system/libraries/Cache/drivers/index.html create mode 100644 system/libraries/Cache/index.html create mode 100644 system/libraries/javascript/index.html diff --git a/application/cache/.htaccess b/application/cache/.htaccess deleted file mode 100644 index 3418e55a6..000000000 --- a/application/cache/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/application/language/index.html b/application/language/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/application/language/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + + \ No newline at end of file diff --git a/system/libraries/Cache/drivers/index.html b/system/libraries/Cache/drivers/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/system/libraries/Cache/drivers/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + + \ No newline at end of file diff --git a/system/libraries/Cache/index.html b/system/libraries/Cache/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/system/libraries/Cache/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + + \ No newline at end of file diff --git a/system/libraries/javascript/index.html b/system/libraries/javascript/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/system/libraries/javascript/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + + \ No newline at end of file -- cgit v1.2.3-24-g4f1b From d878851f2057ebb531e83a90c77fe7c9f553dbc6 Mon Sep 17 00:00:00 2001 From: Ender Teszla Date: Fri, 28 Feb 2014 00:56:07 +0400 Subject: Added a .htaccess file to the application/cache folder for security-in-depths reasons (de bene esse). --- application/cache/.htaccess | 1 + 1 file changed, 1 insertion(+) create mode 100644 application/cache/.htaccess diff --git a/application/cache/.htaccess b/application/cache/.htaccess new file mode 100644 index 000000000..14249c50b --- /dev/null +++ b/application/cache/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 5800de6835bfa943b7ffca94917f3f85696cc35f Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Wed, 14 May 2014 14:20:54 -0400 Subject: Corrections to the tutorial. --- user_guide/tutorial/news_section.html | 4 ++-- user_guide/tutorial/static_pages.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index f8e64fc36..f3d616ab8 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -161,7 +161,7 @@ public function index() <?php foreach ($news as $news_item): ?> <h2><?php echo $news_item['title'] ?></h2> - <div id="main"> + <div class="main"> <?php echo $news_item['text'] ?> </div> <p><a href="news/<?php echo $news_item['slug'] ?>">View article</a></p> @@ -227,4 +227,4 @@ Next Topic:  Create news items - \ No newline at end of file + diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index 4b138d74e..e9aaa9739 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -137,7 +137,7 @@ If you like to be particularly un-original, try "Hello World!".

    public function view($page = 'home') { - if ( ! file_exists('application/views/pages/'.$page.'.php')) + if ( ! file_exists(APPPATH.'/views/pages/'.$page.'.php')) { // Whoops, we don't have a page for that! show_404(); @@ -203,4 +203,4 @@ Next Topic:  News section - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From df09d3940c8ecc95d96099a34a5515fe1c985146 Mon Sep 17 00:00:00 2001 From: Quinn Chrzan Date: Thu, 29 May 2014 17:33:34 -0400 Subject: Removing xor_encode from Encrypt library --- system/libraries/Encrypt.php | 77 +++++++++----------------------------------- 1 file changed, 15 insertions(+), 62 deletions(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index b30a8cf0b..b6758d98f 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -18,7 +18,7 @@ /** * CodeIgniter Encryption Class * - * Provides two-way keyed encoding using XOR Hashing and Mcrypt + * Provides two-way keyed encoding using Mcrypt * * @package CodeIgniter * @subpackage Libraries @@ -45,6 +45,12 @@ class CI_Encrypt { { $this->CI =& get_instance(); $this->_mcrypt_exists = ( ! function_exists('mcrypt_encrypt')) ? FALSE : TRUE; + + if ($this->_mcrypt_exists === FALSE) + { + show_error('The Encrypt library requires the Mcrypt extension.'); + } + log_message('debug', "Encrypt Class Initialized"); } @@ -103,10 +109,10 @@ class CI_Encrypt { * Encodes the message string using bitwise XOR encoding. * The key is combined with a random hash, and then it * too gets converted using XOR. The whole thing is then run - * through mcrypt (if supported) using the randomized key. - * The end result is a double-encrypted message string - * that is randomized with each call to this function, - * even if the supplied message and key are the same. + * through mcrypt using the randomized key. The end result + * is a double-encrypted message string that is randomized + * with each call to this function, even if the supplied + * message and key are the same. * * @access public * @param string the string to encode @@ -116,15 +122,7 @@ class CI_Encrypt { function encode($string, $key = '') { $key = $this->get_key($key); - - if ($this->_mcrypt_exists === TRUE) - { - $enc = $this->mcrypt_encode($string, $key); - } - else - { - $enc = $this->_xor_encode($string, $key); - } + $enc = $this->mcrypt_encode($string, $key); return base64_encode($enc); } @@ -152,16 +150,9 @@ class CI_Encrypt { $dec = base64_decode($string); - if ($this->_mcrypt_exists === TRUE) - { - if (($dec = $this->mcrypt_decode($dec, $key)) === FALSE) - { - return FALSE; - } - } - else + if (($dec = $this->mcrypt_decode($dec, $key)) === FALSE) { - $dec = $this->_xor_decode($dec, $key); + return FALSE; } return $dec; @@ -187,12 +178,6 @@ class CI_Encrypt { */ function encode_from_legacy($string, $legacy_mode = MCRYPT_MODE_ECB, $key = '') { - if ($this->_mcrypt_exists === FALSE) - { - log_message('error', 'Encoding from legacy is available only when Mcrypt is in use.'); - return FALSE; - } - // decode it first // set mode temporarily to what it was when string was encoded with the legacy // algorithm - typically MCRYPT_MODE_ECB @@ -224,38 +209,6 @@ class CI_Encrypt { // -------------------------------------------------------------------- - /** - * XOR Encode - * - * Takes a plain-text string and key as input and generates an - * encoded bit-string using XOR - * - * @access private - * @param string - * @param string - * @return string - */ - function _xor_encode($string, $key) - { - $rand = ''; - while (strlen($rand) < 32) - { - $rand .= mt_rand(0, mt_getrandmax()); - } - - $rand = $this->hash($rand); - - $enc = ''; - for ($i = 0; $i < strlen($string); $i++) - { - $enc .= substr($rand, ($i % strlen($rand)), 1).(substr($rand, ($i % strlen($rand)), 1) ^ substr($string, $i, 1)); - } - - return $this->_xor_merge($enc, $key); - } - - // -------------------------------------------------------------------- - /** * XOR Decode * @@ -544,4 +497,4 @@ class CI_Encrypt { // END CI_Encrypt class /* End of file Encrypt.php */ -/* Location: ./system/libraries/Encrypt.php */ \ No newline at end of file +/* Location: ./system/libraries/Encrypt.php */ -- cgit v1.2.3-24-g4f1b From 9eb99bce5e1a62c5df8758eaf82f6edee61c35b1 Mon Sep 17 00:00:00 2001 From: Quinn Chrzan Date: Thu, 29 May 2014 18:46:06 -0400 Subject: Updating docs for xor_encode removal --- user_guide/libraries/encryption.html | 9 +++------ user_guide/libraries/sessions.html | 4 +++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index cd59a6c30..4331372a3 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -58,11 +58,8 @@ Encryption Class

    Encryption Class

    -

    The Encryption Class provides two-way data encryption. It uses a scheme that either compiles -the message using a randomly hashed bitwise XOR encoding scheme, or is encrypted using -the Mcrypt library. If Mcrypt is not available on your server the encoded message will -still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. -If Mcrypt is available, you'll be provided with a high degree of security appropriate for storage.

    +

    The Encryption Class provides two-way data encryption. It is encrypted using +the Mcrypt library. The Encryption Class requires the Mcrypt extension to run.

    Setting your Key

    @@ -221,4 +218,4 @@ Next Topic:  File Uploading Class - \ No newline at end of file + diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 1b7b73ab9..989170a45 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -71,6 +71,8 @@ generates its own session data, offering more flexibility for developers.

    Note: Even if you are not using encrypted sessions, you must set an encryption key in your config file which is used to aid in preventing session data manipulation.

    +

    Note: The Session class relies on the Encryption class, so you must have Mcrypt extension installed

    +

    Initializing a Session

    Sessions will typically run globally with each page load, so the session class must either be @@ -338,4 +340,4 @@ Next Topic:  Trackback Class - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From e588dea672ceffcce3fbda40efb04087f5e13ac0 Mon Sep 17 00:00:00 2001 From: Quinn Chrzan Date: Fri, 30 May 2014 14:23:40 -0400 Subject: Bumping version numbers and adding upgrade instructions --- user_guide/changelog.html | 14 ++++- 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 | 7 ++- 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 | 2 +- user_guide/installation/upgrade_213.html | 2 +- user_guide/installation/upgrade_214.html | 2 +- user_guide/installation/upgrade_220.html | 86 ++++++++++++++++++++++++++++ user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 5 +- 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 +- 145 files changed, 246 insertions(+), 148 deletions(-) create mode 100644 user_guide/installation/upgrade_220.html diff --git a/user_guide/changelog.html b/user_guide/changelog.html index aebf52580..96fc8e310 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@

    - +

    CodeIgniter User Guide Version 2.1.4

    CodeIgniter User Guide Version 2.2.0
    @@ -57,10 +57,20 @@ Change Log

    Change Log

    +

    Version 2.2.0

    +

    Release Date: June 2, 2014

    + +
      +
    • General Changes +
        +
      • The xor_encode method in the Encyption Class has been deprecated. The Encryption Class now requires the Mcrypt extension to be installed.
        • +
      +
      • +
    +

    Version 2.1.4

    Release Date: July 8, 2013

    -
    • General Changes
        diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 5a31be2db..cef8e5345 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 771f99378..676af154b 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 35b5d3a3a..a12800b08 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 6c3d7a123..69ec826cd 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 679fb0b8e..4ccec7574 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index c130e8ac2..c2a39dcae 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index da38810ac..a5f22ae2e 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 99e01fb12..3589cba9f 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 02d08effc..9dd69e9bd 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 3bfcba48e..c2e6df553 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 63eb0c0e7..c1495bb0b 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 1b7d95701..5770bb0e3 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 53b8b7723..e623fed5e 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 21bfd4fc2..bedcd70bd 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index cf2b00c99..d32cd4695 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 2de0dd66a..592de291c 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index c62fef9f9..90e8c5007 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index c1ea33cf2..76e677b66 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 764b42e57..fdd349e7e 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index af671fb85..f7df56278 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 658754fe8..819b3af15 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index b3f4f3202..be06e3d37 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 760042364..3ed9befdc 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 8cd159fc8..3d180789e 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 46a41f0a2..f0768e923 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 0d424a2e0..111109bdb 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 67a461f65..a1ecd4afd 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index b2f91cebe..1fc665f53 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 25190a5d3..b0611ebec 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 6764b5447..9ad78b231 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 0614dcba0..a22e153e3 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index c75f45d0a..d8026ca34 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 6830fb080..f4e53b769 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 8f9673673..60608ebea 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 4fd99844e..f4f3cffd8 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index e333cf59c..777aecdad 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index ac1b27ed6..744afb964 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 9691d207f..75d57051e 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 34306b584..e00dd76b2 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 61fe93463..946780c19 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 1032014ae..9c602b588 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 4cd704baf..a16a442ca 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 9493eb334..2d967eb2c 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/general/views.html b/user_guide/general/views.html index c4dd6c658..5281b6e2f 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 6b0f2159b..3aba30163 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index b67d9ddd5..64afc774d 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 236f0c477..72f827cfc 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 70193b179..c2c138db2 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 6fb65404f..f0b94ff09 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 80d48681e..9481a21b0 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 1ec80158d..aa8c5ea0e 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 5eb258e1e..ce57838da 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 2268d4543..5ab83d9de 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index b594e25ce..153fefa68 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index e044b34bc..5ed022e53 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 2c7df78ec..7990cabfb 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index c3e4e46d0..be2e6c3cb 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 1a5850e94..379c2b8a0 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 297800f43..5db04cdaf 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 3153b7096..6f80214c8 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index e1f31b8db..624bd18ff 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 2816077af..ae4bc9c06 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index d072ed156..d02d00ac9 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index fd58b43c2..ae599ef0e 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 3ca9519f7..6603a5d1d 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/index.html b/user_guide/index.html index 793a7cade..4b4226b92 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 01a4a58b3..31a3d3bcd 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

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

        Downloading CodeIgniter

        - \ No newline at end of file + diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index ff9d83096..3c16c87e3 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 85d9f7f5f..33a5790a6 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 38ede1294..81e764644 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index f44837782..cc52be7fc 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index fa123d184..5027aa69b 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index b0ab815f3..eab6aaf00 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index badd6dcaa..9218daac9 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 339befd57..97e8136cf 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 064fd66fa..ec25e8ee9 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index c41e1398e..8084276f0 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index eb1ec3be9..3de4cb95d 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index f26aa8a1e..2dea591ad 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index d721ff290..484330c06 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index fb11ee303..da4a5d312 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 7f4035566..b045ba6cc 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 4237857e6..a9292c6de 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index edfa420f3..f1a817b4a 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 6fea1da4e..311cf6e37 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 45347be4f..d599eb1f4 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index cad36b102..96a1bc71b 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index daf652245..d124a5e5b 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 1b307522d..6c1282069 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index 7814de830..b16be70ea 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index 4f5870600..1dceef72f 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index 16ad69d20..cfee8f8de 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index 9480be2d2..684c6691a 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_212.html b/user_guide/installation/upgrade_212.html index f71e5cf04..964628e30 100644 --- a/user_guide/installation/upgrade_212.html +++ b/user_guide/installation/upgrade_212.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_213.html b/user_guide/installation/upgrade_213.html index cd1e48c83..598b6d7c8 100644 --- a/user_guide/installation/upgrade_213.html +++ b/user_guide/installation/upgrade_213.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_214.html b/user_guide/installation/upgrade_214.html index 6e5dc998e..5967591bd 100644 --- a/user_guide/installation/upgrade_214.html +++ b/user_guide/installation/upgrade_214.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrade_220.html b/user_guide/installation/upgrade_220.html new file mode 100644 index 000000000..a4078c305 --- /dev/null +++ b/user_guide/installation/upgrade_220.html @@ -0,0 +1,86 @@ + + + + + +Upgrading from 2.1.4 to 2.2.0 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
        + + + + + +

        CodeIgniter User Guide Version 2.2.0

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

        Upgrading from 2.1.4 to 2.2.0

        + +

        Note: The Encryption Class now requires the Mcrypt extension. If you were previously using the Encrypt Class without Mcrypt this is a breaking change, you must install the Mcrypt extension in order to upgrade.

        + +

        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.

        + +
        + + + +         + + + diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index e85d5d2dc..8999a2b41 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index a0c241f19..e842c8f17 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        @@ -60,6 +60,7 @@ Upgrading from a Previous Version

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

        - \ No newline at end of file + diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 5ece98bec..e00840078 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index 95ded23c8..4b48df3e4 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index b42e22ccb..4c064f7c3 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index d0efa5f74..07c96d83b 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 1fabc9507..e5f242243 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index d286ffead..eea4afae3 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 4331372a3..421b9703a 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 9759d0cb2..238fb29d6 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index a073d88f2..7ac6608de 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 67c0ce75b..55e260eed 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 4f01bded5..a92fe3c22 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index f5049e1df..4114f849e 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index f9d73f2a2..06c5b3d22 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 09287ffe1..78627f992 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1000ca81c..1b05b85ad 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index 018be3044..1651301e0 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 072a25d2c..c3f0f5c75 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 5f1dde410..ec78675b6 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 0f4fce648..100a0c50f 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 8661168f2..145c39a5f 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 989170a45..9a8b411df 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index c95149624..fdd836b75 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index e03aad484..9dab13069 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 93e0cd4b6..7ad1176ec 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 553d43909..4825862ad 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 2f4f34bf1..b63de4c7d 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index c3ff47003..2b5ffe862 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 139ba6871..e6598f289 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 0a03653be..ea857d223 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/license.html b/user_guide/license.html index c990aa2a7..811ae5d2f 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index c2004c756..3fe012c65 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index d51d42c6f..e0b357085 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 7284cd741..859cc63e3 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index aebafe632..9233d99c8 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 049d29cc7..3be8fe34a 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index ec5a418cf..e2ceb4c10 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 1f3883980..37b202394 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 1d98c2e54..ec3267770 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/toc.html b/user_guide/toc.html index 9c28da3bf..1aaaa7325 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index a1c9c2487..9eab7b722 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 4db7fb83e..5f1b83083 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html index 2b5951f10..0c84fecf0 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index d1da60268..ed7255291 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index f3d616ab8..52d34c256 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.4

        CodeIgniter User Guide Version 2.2.0
        diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index e9aaa9739..1c0699f64 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.4

        CodeIgniter User Guide Version 2.2.0
        -- cgit v1.2.3-24-g4f1b From e80b3773c1a2362257298320beff505bcae73b72 Mon Sep 17 00:00:00 2001 From: Quinn Chrzan Date: Fri, 30 May 2014 14:39:32 -0400 Subject: Style fixes and adding link to Mcrypt in upgrade instructions --- user_guide/changelog.html | 2 +- user_guide/installation/upgrade_220.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 96fc8e310..b83611738 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,7 +63,7 @@ Change Log
        • General Changes
            -
          • The xor_encode method in the Encyption Class has been deprecated. The Encryption Class now requires the Mcrypt extension to be installed.
            • +
          • Security: The xor_encode method in the Encyption Class has been deprecated. The Encryption Class now requires the Mcrypt extension to be installed.
        diff --git a/user_guide/installation/upgrade_220.html b/user_guide/installation/upgrade_220.html index a4078c305..600fa7d42 100644 --- a/user_guide/installation/upgrade_220.html +++ b/user_guide/installation/upgrade_220.html @@ -57,7 +57,7 @@ Upgrading from 2.1.4 to 2.2.0

        Upgrading from 2.1.4 to 2.2.0

        -

        Note: The Encryption Class now requires the Mcrypt extension. If you were previously using the Encrypt Class without Mcrypt this is a breaking change, you must install the Mcrypt extension in order to upgrade.

        +

        Note: The Encryption Class now requires the Mcrypt extension. If you were previously using the Encrypt Class without Mcrypt this is a breaking change, you must install the Mcrypt extension in order to upgrade. For information on installing Mcrypt please see the PHP documentation.

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

        -- cgit v1.2.3-24-g4f1b From 0b18634e32efbafb83746c123b7d058b1570a01d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 31 May 2014 20:29:09 +0300 Subject: Changelog messages, bump year in copyright notices --- license.txt | 2 +- system/core/Benchmark.php | 2 +- system/core/CodeIgniter.php | 2 +- system/core/Common.php | 2 +- system/core/Config.php | 2 +- system/core/Controller.php | 4 +-- system/core/Exceptions.php | 2 +- system/core/Hooks.php | 2 +- system/core/Input.php | 2 +- system/core/Lang.php | 2 +- system/core/Loader.php | 2 +- system/core/Model.php | 2 +- system/core/Output.php | 2 +- system/core/Router.php | 2 +- system/core/Security.php | 2 +- system/core/URI.php | 2 +- system/core/Utf8.php | 2 +- system/database/DB.php | 2 +- system/database/DB_active_rec.php | 2 +- system/database/DB_cache.php | 2 +- system/database/DB_driver.php | 2 +- system/database/DB_forge.php | 2 +- system/database/DB_result.php | 2 +- system/database/DB_utility.php | 4 +-- system/database/drivers/cubrid/cubrid_driver.php | 2 +- system/database/drivers/cubrid/cubrid_forge.php | 2 +- system/database/drivers/cubrid/cubrid_result.php | 2 +- system/database/drivers/cubrid/cubrid_utility.php | 2 +- system/database/drivers/mssql/mssql_driver.php | 2 +- system/database/drivers/mssql/mssql_forge.php | 2 +- system/database/drivers/mssql/mssql_result.php | 2 +- system/database/drivers/mssql/mssql_utility.php | 2 +- system/database/drivers/mysql/mysql_driver.php | 2 +- system/database/drivers/mysql/mysql_forge.php | 2 +- system/database/drivers/mysql/mysql_result.php | 2 +- system/database/drivers/mysql/mysql_utility.php | 2 +- system/database/drivers/mysqli/mysqli_driver.php | 2 +- system/database/drivers/mysqli/mysqli_forge.php | 2 +- system/database/drivers/mysqli/mysqli_result.php | 2 +- system/database/drivers/mysqli/mysqli_utility.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/oci8/oci8_forge.php | 2 +- system/database/drivers/oci8/oci8_result.php | 2 +- system/database/drivers/oci8/oci8_utility.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- system/database/drivers/odbc/odbc_forge.php | 2 +- system/database/drivers/odbc/odbc_result.php | 2 +- system/database/drivers/odbc/odbc_utility.php | 2 +- system/database/drivers/pdo/pdo_driver.php | 6 ++-- 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/database/drivers/postgre/postgre_driver.php | 2 +- system/database/drivers/postgre/postgre_forge.php | 2 +- system/database/drivers/postgre/postgre_result.php | 2 +- .../database/drivers/postgre/postgre_utility.php | 2 +- system/database/drivers/sqlite/sqlite_driver.php | 2 +- system/database/drivers/sqlite/sqlite_forge.php | 2 +- system/database/drivers/sqlite/sqlite_result.php | 2 +- system/database/drivers/sqlite/sqlite_utility.php | 2 +- system/database/drivers/sqlsrv/sqlsrv_driver.php | 2 +- system/database/drivers/sqlsrv/sqlsrv_forge.php | 2 +- system/database/drivers/sqlsrv/sqlsrv_result.php | 2 +- system/database/drivers/sqlsrv/sqlsrv_utility.php | 2 +- system/helpers/array_helper.php | 2 +- system/helpers/captcha_helper.php | 2 +- system/helpers/cookie_helper.php | 2 +- system/helpers/date_helper.php | 2 +- system/helpers/directory_helper.php | 2 +- system/helpers/download_helper.php | 2 +- system/helpers/email_helper.php | 2 +- system/helpers/file_helper.php | 2 +- system/helpers/form_helper.php | 2 +- system/helpers/html_helper.php | 2 +- system/helpers/inflector_helper.php | 2 +- system/helpers/language_helper.php | 2 +- system/helpers/number_helper.php | 2 +- system/helpers/path_helper.php | 2 +- system/helpers/security_helper.php | 2 +- system/helpers/smiley_helper.php | 2 +- system/helpers/string_helper.php | 2 +- system/helpers/text_helper.php | 2 +- system/helpers/typography_helper.php | 2 +- system/helpers/url_helper.php | 2 +- system/helpers/xml_helper.php | 2 +- system/libraries/Cache/Cache.php | 36 +++++++++---------- system/libraries/Cache/drivers/Cache_apc.php | 38 +++++++++----------- system/libraries/Cache/drivers/Cache_dummy.php | 7 ++-- system/libraries/Cache/drivers/Cache_file.php | 38 ++++++++++---------- system/libraries/Cache/drivers/Cache_memcached.php | 40 ++++++++++------------ system/libraries/Calendar.php | 2 +- system/libraries/Cart.php | 3 +- system/libraries/Driver.php | 8 ++--- system/libraries/Email.php | 2 +- system/libraries/Encrypt.php | 2 +- system/libraries/Form_validation.php | 2 +- system/libraries/Ftp.php | 2 +- system/libraries/Image_lib.php | 2 +- system/libraries/Javascript.php | 2 +- system/libraries/Log.php | 2 +- system/libraries/Migration.php | 3 +- system/libraries/Pagination.php | 2 +- system/libraries/Parser.php | 2 +- system/libraries/Profiler.php | 2 +- system/libraries/Session.php | 2 +- system/libraries/Sha1.php | 2 +- system/libraries/Table.php | 2 +- system/libraries/Trackback.php | 2 +- system/libraries/Typography.php | 2 +- system/libraries/Unit_test.php | 2 +- system/libraries/Upload.php | 2 +- system/libraries/User_agent.php | 2 +- system/libraries/Xmlrpc.php | 2 +- system/libraries/Xmlrpcs.php | 2 +- system/libraries/Zip.php | 2 +- system/libraries/javascript/Jquery.php | 14 ++++---- user_guide/changelog.html | 13 +++++-- user_guide/database/active_record.html | 4 +-- 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 | 4 ++- user_guide/database/results.html | 4 +-- 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/doc_style/template.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 | 4 +-- 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 | 4 +-- 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 | 2 +- user_guide/installation/upgrade_213.html | 2 +- user_guide/installation/upgrade_214.html | 2 +- user_guide/installation/upgrade_220.html | 4 +-- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 4 +-- 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 | 4 +-- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 4 +-- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 4 +-- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/javascript.html | 4 +-- 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 | 4 +-- 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 | 4 +-- 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 | 4 +-- user_guide/tutorial/static_pages.html | 4 +-- 262 files changed, 367 insertions(+), 375 deletions(-) diff --git a/license.txt b/license.txt index 061cdb9db..0973fd37b 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2008 - 2011, EllisLab, Inc. +Copyright (c) 2008 - 2014, EllisLab, Inc. All rights reserved. This license is a legal agreement between you and EllisLab Inc. for the use diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index a200727ab..a5c3e999b 100755 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index e0819c801..ad2cadd96 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Common.php b/system/core/Common.php index 07534c51f..713b21d85 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Config.php b/system/core/Config.php index 5dffbf3f2..46ed9365c 100755 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Controller.php b/system/core/Controller.php index fddb81e19..6ccaf9755 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -37,7 +37,7 @@ class CI_Controller { public function __construct() { self::$instance =& $this; - + // Assign all the class objects that were instantiated by the // bootstrap file (CodeIgniter.php) to local class variables // so that CI can run as one big super object. diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 869739a5a..451209689 100755 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 33f1c034c..ee5c23076 100755 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Input.php b/system/core/Input.php index 0c1f2b08e..88afa8c7e 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Lang.php b/system/core/Lang.php index 5ac671838..ef5d1080c 100755 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Loader.php b/system/core/Loader.php index 6b7ee0c28..b5b0634e6 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Model.php b/system/core/Model.php index e15ffbebc..1f142509e 100755 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Output.php b/system/core/Output.php index ccecafd2b..7959befb7 100755 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Router.php b/system/core/Router.php index 6da667472..b48a34562 100755 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Security.php b/system/core/Security.php index b0d39b981..efa2df922 100755 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/URI.php b/system/core/URI.php index a3ae20cc3..a2f3b23b4 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/core/Utf8.php b/system/core/Utf8.php index 2a27d1f35..1a5bee198 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 diff --git a/system/database/DB.php b/system/database/DB.php index 8314d3b97..d74738a03 100755 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 129eaa7b6..85faa555d 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index ad1c28d72..e6945950b 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 775fd3354..c342aacbd 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 6bc40411b..b92069bbc 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 48d66c8e4..5b4f60e4b 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 52196b7ce..6a9d8cc59 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -1,12 +1,12 @@ {$this->_adapter}->get($id); } @@ -112,7 +112,7 @@ class CI_Cache extends CI_Driver_Library { * Cache Info * * @param string user/filehits - * @return mixed array on success, false on failure + * @return mixed array on success, false on failure */ public function cache_info($type = 'user') { @@ -120,7 +120,7 @@ class CI_Cache extends CI_Driver_Library { } // ------------------------------------------------------------------------ - + /** * Get Cache Metadata * @@ -131,7 +131,7 @@ class CI_Cache extends CI_Driver_Library { { return $this->{$this->_adapter}->get_metadata($id); } - + // ------------------------------------------------------------------------ /** @@ -139,11 +139,11 @@ class CI_Cache extends CI_Driver_Library { * * Initialize class properties based on the configuration array. * - * @param array + * @param array * @return void */ private function _initialize($config) - { + { $default_config = array( 'adapter', 'memcached' @@ -207,10 +207,8 @@ class CI_Cache extends CI_Driver_Library { return $obj; } - - // ------------------------------------------------------------------------ + } -// End Class /* End of file Cache.php */ /* Location: ./system/libraries/Cache/Cache.php */ \ No newline at end of file diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php index f750e6cb7..fdc740138 100644 --- a/system/libraries/Cache/drivers/Cache_apc.php +++ b/system/libraries/Cache/drivers/Cache_apc.php @@ -6,34 +6,34 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 - * @filesource + * @filesource */ // ------------------------------------------------------------------------ /** - * CodeIgniter APC Caching Class + * CodeIgniter APC Caching Class * * @package CodeIgniter * @subpackage Libraries * @category Core * @author ExpressionEngine Dev Team - * @link + * @link */ class CI_Cache_apc extends CI_Driver { /** - * Get + * Get * - * Look for a value in the cache. If it exists, return the data + * Look for a value in the cache. If it exists, return the data * if not, return FALSE * - * @param string + * @param string * @return mixed value that is stored/FALSE on failure */ public function get($id) @@ -43,8 +43,8 @@ class CI_Cache_apc extends CI_Driver { return (is_array($data)) ? $data[0] : FALSE; } - // ------------------------------------------------------------------------ - + // ------------------------------------------------------------------------ + /** * Cache Save * @@ -58,7 +58,7 @@ class CI_Cache_apc extends CI_Driver { { return apc_store($id, array($data, time(), $ttl), $ttl); } - + // ------------------------------------------------------------------------ /** @@ -90,12 +90,12 @@ class CI_Cache_apc extends CI_Driver { * Cache Info * * @param string user/filehits - * @return mixed array on success, false on failure + * @return mixed array on success, false on failure */ - public function cache_info($type = NULL) - { - return apc_cache_info($type); - } + public function cache_info($type = NULL) + { + return apc_cache_info($type); + } // ------------------------------------------------------------------------ @@ -137,15 +137,11 @@ class CI_Cache_apc extends CI_Driver { log_message('error', 'The APC PHP extension must be loaded to use APC Cache.'); return FALSE; } - + return TRUE; } - // ------------------------------------------------------------------------ - - } -// End Class /* End of file Cache_apc.php */ -/* Location: ./system/libraries/Cache/drivers/Cache_apc.php */ +/* Location: ./system/libraries/Cache/drivers/Cache_apc.php */ \ No newline at end of file diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php index b11b5b8fc..6c38e91ad 100644 --- a/system/libraries/Cache/drivers/Cache_dummy.php +++ b/system/libraries/Cache/drivers/Cache_dummy.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 4.3.2 or newer + * An open source application development framework for PHP 5.1.6 or newer * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 @@ -120,10 +120,7 @@ class CI_Cache_dummy extends CI_Driver { return TRUE; } - // ------------------------------------------------------------------------ - } -// End Class /* End of file Cache_dummy.php */ /* Location: ./system/libraries/Cache/drivers/Cache_dummy.php */ \ No newline at end of file diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php index e515eebf1..50602b4b8 100644 --- a/system/libraries/Cache/drivers/Cache_file.php +++ b/system/libraries/Cache/drivers/Cache_file.php @@ -2,27 +2,27 @@ /** * CodeIgniter * - * An open source application development framework for PHP 4.3.2 or newer + * An open source application development framework for PHP 5.1.6 or newer * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 - * @filesource + * @filesource */ // ------------------------------------------------------------------------ /** - * CodeIgniter Memcached Caching Class + * CodeIgniter Memcached Caching Class * * @package CodeIgniter * @subpackage Libraries * @category Core * @author ExpressionEngine Dev Team - * @link + * @link */ class CI_Cache_file extends CI_Driver { @@ -36,9 +36,9 @@ class CI_Cache_file extends CI_Driver { { $CI =& get_instance(); $CI->load->helper('file'); - + $path = $CI->config->item('cache_path'); - + $this->_cache_path = ($path == '') ? APPPATH.'cache/' : $path; } @@ -56,16 +56,16 @@ class CI_Cache_file extends CI_Driver { { return FALSE; } - + $data = read_file($this->_cache_path.$id); $data = unserialize($data); - + if (time() > $data['time'] + $data['ttl']) { unlink($this->_cache_path.$id); return FALSE; } - + return $data['data']; } @@ -76,22 +76,22 @@ class CI_Cache_file extends CI_Driver { * * @param string unique key * @param mixed data to store - * @param int length of time (in seconds) the cache is valid - * - Default is 60 seconds + * @param int length of time (in seconds) the cache is valid + * - Default is 60 seconds * @return boolean true on success/false on failure */ public function save($id, $data, $ttl = 60) - { + { $contents = array( 'time' => time(), - 'ttl' => $ttl, + 'ttl' => $ttl, 'data' => $data ); - + if (write_file($this->_cache_path.$id, serialize($contents))) { @chmod($this->_cache_path.$id, 0777); - return TRUE; + return TRUE; } return FALSE; @@ -116,7 +116,7 @@ class CI_Cache_file extends CI_Driver { * Clean the Cache * * @return boolean false on failure/true on success - */ + */ public function clean() { return delete_files($this->_cache_path); @@ -179,7 +179,7 @@ class CI_Cache_file extends CI_Driver { * Is supported * * In the file driver, check to see that the cache directory is indeed writable - * + * * @return boolean */ public function is_supported() @@ -187,9 +187,7 @@ class CI_Cache_file extends CI_Driver { return is_really_writable($this->_cache_path); } - // ------------------------------------------------------------------------ } -// End Class /* End of file Cache_file.php */ /* Location: ./system/libraries/Cache/drivers/Cache_file.php */ \ No newline at end of file diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php index 747842091..f9d578b93 100644 --- a/system/libraries/Cache/drivers/Cache_memcached.php +++ b/system/libraries/Cache/drivers/Cache_memcached.php @@ -2,27 +2,27 @@ /** * CodeIgniter * - * An open source application development framework for PHP 4.3.2 or newer + * An open source application development framework for PHP 5.1.6 or newer * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014 EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 - * @filesource + * @filesource */ // ------------------------------------------------------------------------ /** - * CodeIgniter Memcached Caching Class + * CodeIgniter Memcached Caching Class * * @package CodeIgniter * @subpackage Libraries * @category Core * @author ExpressionEngine Dev Team - * @link + * @link */ class CI_Cache_memcached extends CI_Driver { @@ -37,18 +37,18 @@ class CI_Cache_memcached extends CI_Driver { ) ); - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ /** * Fetch from cache * * @param mixed unique key id * @return mixed data on success/false on failure - */ + */ public function get($id) - { + { $data = $this->_memcached->get($id); - + return (is_array($data)) ? $data[0] : FALSE; } @@ -72,12 +72,12 @@ class CI_Cache_memcached extends CI_Driver { { return $this->_memcached->set($id, array($data, time(), $ttl), 0, $ttl); } - + return FALSE; } // ------------------------------------------------------------------------ - + /** * Delete from Cache * @@ -90,7 +90,7 @@ class CI_Cache_memcached extends CI_Driver { } // ------------------------------------------------------------------------ - + /** * Clean the Cache * @@ -115,7 +115,7 @@ class CI_Cache_memcached extends CI_Driver { } // ------------------------------------------------------------------------ - + /** * Get Cache Metadata * @@ -158,10 +158,10 @@ class CI_Cache_memcached extends CI_Driver { foreach ($CI->config->config['memcached'] as $name => $conf) { $this->_memcache_conf[$name] = $conf; - } - } + } + } } - + $this->_memcached = new Memcached(); foreach ($this->_memcache_conf as $name => $cache_server) @@ -170,7 +170,7 @@ class CI_Cache_memcached extends CI_Driver { { $cache_server['hostname'] = $this->_default_options['default_host']; } - + if ( ! array_key_exists('port', $cache_server)) { $cache_server['port'] = $this->_default_options['default_port']; @@ -201,18 +201,14 @@ class CI_Cache_memcached extends CI_Driver { if ( ! extension_loaded('memcached')) { log_message('error', 'The Memcached Extension must be loaded to use Memcached Cache.'); - return FALSE; } - + $this->_setup_memcached(); return TRUE; } - // ------------------------------------------------------------------------ - } -// End Class /* End of file Cache_memcached.php */ /* Location: ./system/libraries/Cache/drivers/Cache_memcached.php */ \ No newline at end of file diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index df0fd6eeb..626097a9b 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index da47b5a19..86a01f796 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 - 2012, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -546,7 +546,6 @@ class CI_Cart { } -// END Cart Class /* End of file Cart.php */ /* Location: ./system/libraries/Cart.php */ \ No newline at end of file diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index 4912c4aa7..9ae7b0c7c 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 - 2012, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -43,11 +43,11 @@ class CI_Driver_Library { // The class will be prefixed with the parent lib $child_class = $this->lib_name.'_'.$child; - + // Remove the CI_ prefix and lowercase $lib_name = ucfirst(strtolower(str_replace('CI_', '', $this->lib_name))); $driver_name = strtolower(str_replace('CI_', '', $child_class)); - + if (in_array($driver_name, array_map('strtolower', $this->valid_drivers))) { // check and see if the driver is in a separate file @@ -220,8 +220,6 @@ class CI_Driver { } } - // -------------------------------------------------------------------- - } // END CI_Driver CLASS diff --git a/system/libraries/Email.php b/system/libraries/Email.php index ebe7fe4d9..10cbc346d 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index b6758d98f..8e5c1fe53 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 9aab5da4b..3839fe42b 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index d7a8b3b02..1656dfb47 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 21ec2cb4b..eccfe41c7 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index 34e0d7001..a26bb8400 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 9f1db76ba..6d3f9094d 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, 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 ffa640ba6..241ce1e59 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 - 2012, EllisLab, Inc. + * @copyright Copyright (c) 2006 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -322,6 +322,7 @@ class CI_Migration { { return get_instance()->$var; } + } /* End of file Migration.php */ diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index cdaacf2d4..8b3aa8748 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index d223da020..4d31f81c7 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 882a82c1f..2fe21db11 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 891fdd36a..53b914fbd 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php index 1a657572b..33778f965 100644 --- a/system/libraries/Sha1.php +++ b/system/libraries/Sha1.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Table.php b/system/libraries/Table.php index def696776..a2353d1e1 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.3.1 diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index b0a767822..898553cd1 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 734cec104..b30582d8a 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index 5bd7e801a..b8919e1e5 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.3.1 diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 0e5d73b19..c188c39bc 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 0b77a7d42..9b0d87134 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index d702e902f..f0f53cefe 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index 9cd332147..d9d53c8a1 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 666327d5c..ffff3f340 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php index baab83d25..48d8b3e57 100644 --- a/system/libraries/javascript/Jquery.php +++ b/system/libraries/javascript/Jquery.php @@ -3,7 +3,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 4.3.2 or newer + * An open source application development framework for PHP 5.1.6 or newer * * @package CodeIgniter * @author ExpressionEngine Dev Team @@ -23,7 +23,7 @@ * @category Loader * @link http://www.codeigniter.com/user_guide/libraries/javascript.html */ - + class CI_Jquery extends CI_Javascript { var $_javascript_folder = 'js'; @@ -36,18 +36,18 @@ class CI_Jquery extends CI_Javascript { public function __construct($params) { - $this->CI =& get_instance(); + $this->CI =& get_instance(); extract($params); if ($autoload === TRUE) { - $this->script(); + $this->script(); } - + log_message('debug', "Jquery Class Initialized"); } - - // -------------------------------------------------------------------- + + // -------------------------------------------------------------------- // Event Code // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b83611738..74f419bdf 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,11 +63,19 @@ Change Log
        • General Changes
            -
          • Security: The xor_encode method in the Encyption Class has been deprecated. The Encryption Class now requires the Mcrypt extension to be installed.
            • +
          • Security: The xor_encode() method in the Encyption Class has been removed. The Encryption Class now requires the Mcrypt extension to be installed.
        +

        Bug fixes for 2.2.0:

        +
          +
        • Fixed an edge case (#2583) in the Email Library where Database Forge Class methods create_table(), drop_table() and rename_table() produced broken SQL for tge 'sqlsrv' driver.
          • +
        • Fixed a bug (#2427) - PDO Migrations Library configuration file was mistakenly using Windows style line feeds.
        • Fixed a bug (#1273) - Active Record method set_update_batch() was using the incorrect variables and would cause an error.
        • Fixed a bug (#2337) - Email Library method print_debugger() was not using htmlspecialchars() when being shown in the browser.
          • -
        • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() were incorrect using the sqlsrv driver.
        @@ -1529,7 +1536,7 @@ Previous Topic:  License Agreement User Guide Home   ·   Next Topic:  Credits

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index cef8e5345..264992a3f 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -817,8 +817,8 @@ Previous Topic:  Query Helper Functions User Guide Home   ·   Next Topic:  Transactions

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 676af154b..d88e5c951 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -213,7 +213,7 @@ Previous Topic:  Custom Function CallsUser Guide Home   ·   Next Topic:  Database manipulation with Database Forge

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index a12800b08..a56116924 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -111,7 +111,7 @@ Previous Topic:  Field MetaData User Guide Home   ·   Next Topic:  Query Caching

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 69ec826cd..1e0b0e2f6 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -157,7 +157,7 @@ Previous Topic:  Quick Start: Usage ExamplesUser Guide Home   ·   Next Topic:  Connecting to your Database

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 4ccec7574..779774fdf 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -181,7 +181,7 @@ Previous Topic:  Database ConfigurationUser Guide Home   ·   Next Topic:  Queries

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index c2a39dcae..a9eb5b5d3 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -210,7 +210,7 @@ Previous Topic:  Database Class User Guide Home   ·   Next Topic:  Database Configuration

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index a5f22ae2e..de373beca 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -156,7 +156,7 @@ Previous Topic:   Table Data User Guide Home   ·   Next Topic:  Custom Function Calls

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 3589cba9f..ef6f92df5 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -227,7 +227,7 @@ Previous Topic:  DB Caching Class Top of Page   ·   User Guide Home   ·   Next Topic:  Database Utilities Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 9dd69e9bd..c0bf08f20 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -144,7 +144,7 @@ Previous Topic:  Query Results User Guide Home   ·   Next Topic:  Active Record Pattern

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/index.html b/user_guide/database/index.html index c2e6df553..f27113675 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -92,7 +92,7 @@ Previous Topic:  Caching Class User Guide Home   ·   Next Topic:  Quick Start: Usage Examples

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index c1495bb0b..83d79550b 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -95,6 +95,8 @@ $this->db->dbprefix('tablename');

        In many databases it is advisable to protect table and field names - for example with backticks in MySQL. Active Record queries are automatically protected, however if you need to manually protect an identifier you can use:

        $this->db->protect_identifiers('table_name');

        +

        Although Active Record will try its best to properly quote any field and table names that you feed it, note that it is NOT designed to work with arbitrary user input. DO NOT feed it with unsanitized user data.

        +

        This function will also add a table prefix to your table, assuming you have a prefix specified in your database config file. To enable the prefixing set TRUE (boolen) via the second parameter:

        $this->db->protect_identifiers('table_name', TRUE);

        @@ -151,7 +153,7 @@ Previous Topic:  Connecting to your Database User Guide Home   ·   Next Topic:  Query Results

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 5770bb0e3..28c442dac 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -252,8 +252,8 @@ Previous Topic:  Queries User Guide Home   ·   Next Topic:  Query Helper Functions

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index e623fed5e..327bfc699 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -106,7 +106,7 @@ Previous Topic:   Transactions User Guide Home   ·   Next Topic:   Field Metadata

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index bedcd70bd..05143af8e 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -193,7 +193,7 @@ Previous Topic:   Field MetaData   User Guide Home   ·   Next Topic:  Table Metadata

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index d32cd4695..9d30942fc 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -307,7 +307,7 @@ Previous Topic:  DB Forge Class Top of Page   ·   User Guide Home   ·   Next Topic:  Javascript Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 592de291c..83ccbe85a 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -80,7 +80,7 @@ Previous Topic:  PHP Style Guide< User Guide Home   ·   Next Topic:  Benchmarking Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index 3fde59c9e..67904ee08 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -121,7 +121,7 @@ Previous Topic:  Previous Class User Guide Home   ·   Next Topic:  Next Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 90e8c5007..f15c4784c 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -140,7 +140,7 @@ Previous Topic:  Managing ApplicationsUser Guide Home   ·   Next Topic:  Security

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 76e677b66..55c039d7e 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -110,7 +110,7 @@ Previous Topic:  Creating Core Libra User Guide Home   ·   Next Topic:  Auto-loading Resources

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index fdd349e7e..e73d1ff83 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -93,7 +93,7 @@ Previous Topic:  Hooks - Extending the Core Top of Page   ·   User Guide Home   ·   Next Topic:  Common Functions

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index f7df56278..f841dee3b 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -108,7 +108,7 @@ Previous Topic:  Error Handling User Guide Home   ·   Next Topic:  Profiling Your Application

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 819b3af15..948e508f7 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -143,7 +143,7 @@ Previous Topic:  CodeIgniter URLs Top of Page   ·   User Guide Home   ·   Next Topic:  Reserved Names

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index be06e3d37..119d7fa7d 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -120,7 +120,7 @@ Previous Topic:  Auto-loading Resources< Top of Page   ·   User Guide Home   ·   Next Topic:  URI Routing

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 3ed9befdc..263564aa7 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -381,7 +381,7 @@ Previous Topic:  CodeIgniter URLs Top of Page   ·   User Guide Home   ·   Next Topic:  Reserved Names

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 3d180789e..e01ce9260 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -179,7 +179,7 @@ Previous Topic:  Creating Your Own L User Guide Home   ·   Next Topic:  Hooks - Extending the Core

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index f0768e923..35950f641 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -93,7 +93,7 @@ Previous Topic:  Using CodeIgniter Drivers User Guide Home   ·   Next Topic:  Creating Core System Classes

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 111109bdb..c5c82e8dd 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -286,7 +286,7 @@ Previous Topic:  Using CodeIgniter Libraries< User Guide Home   ·   Next Topic:  Using CodeIgniter Drivers

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index a1ecd4afd..07f00677d 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -80,7 +80,7 @@ Previous Topic:  Change Log User Guide Home   ·   Next Topic:  Downloading CodeIgniter

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 1fc665f53..f47929cf4 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -97,7 +97,7 @@ Previous Topic:  Creating Libraries< User Guide Home   ·   Next Topic:  Creating Drivers

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index b0611ebec..8c8a99b47 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -119,7 +119,7 @@ Previous Topic:  Managing ApplicationsUser Guide Home   ·   Next Topic:  Alternative PHP Syntax

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 9ad78b231..bba7d4e38 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -133,7 +133,7 @@ Previous Topic:  URI Routing User Guide Home   ·   Next Topic:  Page Caching

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index a22e153e3..d1e03cc49 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -178,7 +178,7 @@ Previous Topic:  Models User Guide Home   ·   Next Topic:  Using Libraries

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index d8026ca34..dbeecbed9 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -158,7 +158,7 @@ Previous Topic:  Creating Core Classes User Guide Home   ·   Next Topic:  Auto-loading Resources

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index f4e53b769..d84fa110e 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -91,7 +91,7 @@ Previous Topic:  Helpers User Guide Home   ·   Next Topic:  Creating Libraries

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 60608ebea..b964704c0 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -126,7 +126,7 @@ Previous Topic:  Profiling Your ApplicationUser Guide Home   ·   Next Topic:  Alternative PHP Syntax

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/models.html b/user_guide/general/models.html index f4f3cffd8..ad72a8447 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -244,7 +244,7 @@ Previous Topic:  Views User Guide Home   ·   Next Topic:  Helpers

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 777aecdad..d34ab4c93 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -174,7 +174,7 @@ Previous Topic:  Caching User Guide Home   ·   Next Topic:  Managing Applications

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 744afb964..9db13f008 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -70,7 +70,7 @@ Quick Reference Chart Top of Page   ·   User Guide Home

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 75d57051e..d49cbdd07 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -75,7 +75,7 @@ Server Requirements User Guide Home   ·   Next Topic:  License Agreement

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index e00dd76b2..3ff85de51 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -121,7 +121,7 @@ Previous Topic:  Controllers Top of Page   ·   User Guide Home   ·   Next Topic:  Views

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 946780c19..ad4cffad3 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -164,7 +164,7 @@ Previous Topic:  Common Functions User Guide Home   ·   Next Topic:  Error Handling

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 9c602b588..76a5f0021 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -157,7 +157,7 @@ Previous Topic:  Alternative PHP User Guide Home   ·   Next Topic:  PHP Style Guide

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index a16a442ca..cdf95d27e 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -672,7 +672,7 @@ Previous Topic:  Security User Guide Home   ·   Next Topic:  Writing Documentation

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 2d967eb2c..53dff34e3 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -144,7 +144,7 @@ segment based URLs.

        Top of Page   ·   User Guide Home   ·   Next Topic:  Controllers

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 5281b6e2f..d6049191e 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -267,7 +267,7 @@ Previous Topic:  Reserved Names User Guide Home   ·   Next Topic:  Models

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 3aba30163..c709c11c9 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -163,7 +163,7 @@ Previous Topic:   Javascript Cl Top of Page   ·   User Guide Home   ·   Next Topic:  CAPTCHA Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 64afc774d..6780464b2 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -188,8 +188,8 @@ Previous Topic:  Array Helper Top of Page   ·   User Guide Home   ·   Next Topic:  Cookie Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 72f827cfc..7695b65a3 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -100,7 +100,7 @@ Previous Topic:  CAPTCHA Helper Top of Page   ·   User Guide Home   ·   Next Topic:  Date Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index c2c138db2..48aa682d1 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -401,7 +401,7 @@ Previous Topic:  Cookie Helper User Guide Home   ·   Next Topic:  Directory Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index f0b94ff09..f3e41e692 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -136,7 +136,7 @@ Previous Topic:  Date Helper User Guide Home   ·   Next Topic:  Download Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 9481a21b0..6582fbbba 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -105,7 +105,7 @@ Previous Topic:  Directory Helper Top of Page   ·   User Guide Home   ·   Next Topic:  Email Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index aa8c5ea0e..242efaf32 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -95,7 +95,7 @@ Previous Topic:  Download Helper Top of Page   ·   User Guide Home   ·   Next Topic:  File Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index ce57838da..6c1a48fce 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -172,7 +172,7 @@ Previous Topic:  Email Helper Top of Page   ·   User Guide Home   ·   Next Topic:  Form Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 5ab83d9de..1d11affed 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -477,7 +477,7 @@ Previous Topic:  File Helper User Guide Home   ·   Next Topic:  HTML Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 153fefa68..2a8cb1a1d 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -383,7 +383,7 @@ Previous Topic:  Form Helper Top of Page   ·   User Guide Home   ·   Next Topic:   Path Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 5ed022e53..ec81ac08e 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -144,7 +144,7 @@ Previous Topic:   HTML Helper User Guide Home   ·   Next Topic:  Number Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 7990cabfb..522cbda7d 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -91,7 +91,7 @@ Previous Topic:  Date Helper User Guide Home   ·   Next Topic:  Download Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index be2e6c3cb..b97c5f34b 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -106,7 +106,7 @@ Previous Topic:  Inflector Helper User Guide Home   ·   Next Topic:  Path Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 379c2b8a0..1b4665a61 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -99,7 +99,7 @@ Previous Topic:  Number Helper User Guide Home   ·   Next Topic:  Security Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 5db04cdaf..53f3e2f48 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -125,7 +125,7 @@ Previous Topic:   Path Helper Top of Page   ·   User Guide Home   ·   Next Topic:  Smiley Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 6f80214c8..9c9acd673 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -208,7 +208,7 @@ Previous Topic:  Security Helper User Guide Home   ·   Next Topic:  String Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 624bd18ff..d1097d79c 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -182,7 +182,7 @@ Previous Topic:  Smiley Helper User Guide Home   ·   Next Topic:  Text Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index ae4bc9c06..cf2f07fdd 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -204,7 +204,7 @@ Previous Topic:  String Helper User Guide Home   ·   Next Topic:  Typography Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index d02d00ac9..08a22cddf 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -105,7 +105,7 @@ Previous Topic:  Text Helper User Guide Home   ·   Next Topic:  URL Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index ae599ef0e..be81e6096 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -295,7 +295,7 @@ Previous Topic:  Typography HelperUser Guide Home   ·   Next Topic:  XML Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 6603a5d1d..2c44471fe 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -98,7 +98,7 @@ Previous Topic:  URL Helper Top of Page   ·   User Guide Home

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/index.html b/user_guide/index.html index 4b4226b92..68c8e0c1d 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -89,7 +89,7 @@ minimizing the amount of code needed for a given task.

        diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 31a3d3bcd..bb6b9b681 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -114,8 +114,8 @@ Previous Topic:  Credits User Guide Home   ·   Next Topic:  Installation Instructions

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 3c16c87e3..f53a24cfe 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -101,7 +101,7 @@ Previous Topic:  Credits Next Topic:  Upgrading from a Previous Version

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 33a5790a6..49ebdcff5 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -83,7 +83,7 @@ Previous Topic:  Upgrading from a Previous Ve User Guide Home   ·   Next Topic:  CodeIgniter at a Glance

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 81e764644..2806d5146 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -85,7 +85,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index cc52be7fc..6495daebb 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -196,7 +196,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 5027aa69b..ad0388dbe 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -95,7 +95,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index eab6aaf00..348b2e535 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -93,7 +93,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 9218daac9..f38b0d94c 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -105,7 +105,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 97e8136cf..9f3b82a7e 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -138,7 +138,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index ec25e8ee9..74db82f58 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -141,7 +141,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 8084276f0..42932eade 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -171,7 +171,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 3de4cb95d..f848c9d82 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -104,7 +104,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 2dea591ad..5ea7de6ea 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -93,7 +93,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 484330c06..a39384efd 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -109,7 +109,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index da4a5d312..9aab9cc7a 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -118,7 +118,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index b045ba6cc..c6defba16 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -91,7 +91,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index a9292c6de..8024bf57c 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -99,7 +99,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index f1a817b4a..3c9634675 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -92,7 +92,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 311cf6e37..5f3c5a318 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -114,7 +114,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index d599eb1f4..1687a690e 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -91,7 +91,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 96a1bc71b..048dc2215 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -102,7 +102,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index d124a5e5b..a17a1a2d2 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -124,7 +124,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 6c1282069..654e0cd9b 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -98,7 +98,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index b16be70ea..7917f6854 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -90,7 +90,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index 1dceef72f..079d16e6f 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -114,7 +114,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index cfee8f8de..6d4f34106 100644 --- a/user_guide/installation/upgrade_210.html +++ b/user_guide/installation/upgrade_210.html @@ -82,7 +82,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index 684c6691a..5b437ceb0 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -87,7 +87,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_212.html b/user_guide/installation/upgrade_212.html index 964628e30..c681761a7 100644 --- a/user_guide/installation/upgrade_212.html +++ b/user_guide/installation/upgrade_212.html @@ -77,7 +77,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_213.html b/user_guide/installation/upgrade_213.html index 598b6d7c8..a71d09b8d 100644 --- a/user_guide/installation/upgrade_213.html +++ b/user_guide/installation/upgrade_213.html @@ -77,7 +77,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_214.html b/user_guide/installation/upgrade_214.html index 5967591bd..ec7f6c2c1 100644 --- a/user_guide/installation/upgrade_214.html +++ b/user_guide/installation/upgrade_214.html @@ -77,7 +77,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrade_220.html b/user_guide/installation/upgrade_220.html index 600fa7d42..64c816d7f 100644 --- a/user_guide/installation/upgrade_220.html +++ b/user_guide/installation/upgrade_220.html @@ -79,8 +79,8 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 8999a2b41..d205a9502 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -137,7 +137,7 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index e842c8f17..aa436ff71 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -104,8 +104,8 @@ Previous Topic:  Installation Instructions User Guide Home   ·   Next Topic:  Troubleshooting

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index e00840078..f7cf5e668 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -191,7 +191,7 @@ Previous Topic:  Writing Documentaio User Guide Home   ·   Next Topic:  Calendar Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index 4b48df3e4..47c2a4efe 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -186,7 +186,7 @@ Previous Topic:  Zip Encoding Class User Guide Home   ·   Next Topic:  Database Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 4c064f7c3..f285e86ec 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -242,7 +242,7 @@ Previous Topic:  Benchmark Class User Guide Home   ·   Next Topic:  Cart Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 07c96d83b..16e36d9ef 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -339,7 +339,7 @@ Previous Topic:  Calendar Class User Guide Home   ·   Next Topic:  Config Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index e5f242243..03583b406 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -215,8 +215,8 @@ Previous Topic:  Calendaring Class User Guide Home   ·   Next Topic:  Database Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index eea4afae3..5ff8789ca 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -300,7 +300,7 @@ Previous Topic:  Database Class User Guide Home   ·   Next Topic:  Encryption Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 421b9703a..6332b7e86 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -214,8 +214,8 @@ Previous Topic:  Email Class User Guide Home   ·   Next Topic:  File Uploading Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 238fb29d6..513d6506e 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -444,7 +444,7 @@ Previous Topic:  Encryption Helper User Guide Home   ·   Next Topic:  Form Validation Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  Ellislab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  Ellislab, Inc.

        diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 7ac6608de..a89418f96 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1243,8 +1243,8 @@ Previous Topic:  File Uploading ClassUser Guide Home   ·   Next Topic:  FTP Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 55e260eed..58a3f8d08 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -308,7 +308,7 @@ Previous Topic:  Form Validation Class< User Guide Home   ·   Next Topic:  HTML Table Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index a92fe3c22..b205ed74e 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -660,7 +660,7 @@ Previous Topic:  HTML Table Class User Guide Home   ·   Next Topic:  Input Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 4114f849e..a99378df4 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -288,7 +288,7 @@ Previous Topic:  Image Manipulation Class User Guide Home   ·   Next Topic:  Loader Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 06c5b3d22..40f9af487 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -240,8 +240,8 @@ Previous Topic:  Database Class Top of Page   ·   User Guide Home   ·   Next Topic:  Array Helper

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 78627f992..b2473d9dd 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -130,7 +130,7 @@ Previous Topic:  Loader Class User Guide Home   ·   Next Topic:  Output Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1b05b85ad..c1209973f 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -266,7 +266,7 @@ Previous Topic:  Input Class User Guide Home   ·   Next Topic:  Language Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index 1651301e0..dbda8d48b 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -169,7 +169,7 @@ Previous Topic:  Form Validation Class< User Guide Home   ·   Next Topic:  HTML Table Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index c3f0f5c75..4d92d4185 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -170,7 +170,7 @@ Previous Topic:  Language Class User Guide Home   ·   Next Topic:  Pagination Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index ec78675b6..2fe603274 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -226,7 +226,7 @@ Previous Topic:  Output Class User Guide Home   ·   Next Topic:  Session Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 100a0c50f..8ea6d09e1 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -205,7 +205,7 @@ Previous Topic:  Trackback Class User Guide Home   ·   Next Topic:  Typography

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 145c39a5f..3ea2d8ff4 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -128,7 +128,7 @@ Previous Topic:  Pagination Class User Guide Home   ·   Next Topic:  Session Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 9a8b411df..39706eeea 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -336,8 +336,8 @@ Previous Topic:  Security Class User Guide Home   ·   Next Topic:  Trackback Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        - + \ No newline at end of file diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index fdd836b75..06af266a2 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -308,7 +308,7 @@ Previous Topic:  FTP Class   &mi User Guide Home   ·   Next Topic:  Image Manipulation Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 9dab13069..a8e67bf51 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -239,7 +239,7 @@ Previous Topic:  Session Class User Guide Home   ·   Next Topic:  Template Parser Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 7ad1176ec..9c6abb0aa 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -153,7 +153,7 @@ Previous Topic:  Template Parser User Guide Home   ·   Next Topic:  Unit Testing Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 4825862ad..f54239b43 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -219,7 +219,7 @@ Previous Topic:  Typography Class User Guide Home   ·   Next Topic:  URI Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index b63de4c7d..be49a4dcf 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -245,7 +245,7 @@ Previous Topic:  Unit Testing Class User Guide Home   ·   Next Topic:  User Agent Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 2b5ffe862..33ec6b45e 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -219,7 +219,7 @@ Previous Topic:  URI Class User Guide Home   ·   Next Topic:  XML-RPC Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index e6598f289..72b210297 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -512,7 +512,7 @@ Previous Topic:  User Agent Class User Guide Home   ·   Next Topic:  Zip Encoding Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index ea857d223..6d9b63a3c 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -281,7 +281,7 @@ Previous Topic:   XML-RPC Class User Guide Home   ·   Next Topic:  Caching Class

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/license.html b/user_guide/license.html index 811ae5d2f..47f9e35b1 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -60,7 +60,7 @@ License Agreement

        CodeIgniter License Agreement

        -

        Copyright (c) 2008 - 2011, EllisLab, Inc.
        +

        Copyright (c) 2008 - 2014, EllisLab, Inc.
        All rights reserved.

        This license is a legal agreement between you and EllisLab Inc. for the use of CodeIgniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.

        @@ -100,7 +100,7 @@ Previous Topic:  Server Requiremen User Guide Home   ·   Next Topic:  Change Log

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 3fe012c65..117b87b93 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -88,7 +88,7 @@ Previous Topic:  CodeIgniter Features User Guide Home   ·   Next Topic:  Model-View-Controller

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index e0b357085..3d490c56c 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -155,7 +155,7 @@ Previous Topic:  Getting Started User Guide Home   ·   Next Topic:  CodeIgniter Cheatsheets

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 859cc63e3..15758f982 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -76,7 +76,7 @@ Previous Topic:  CodeIgniter at a GlanceUser Guide Home   ·   Next Topic:  CodeIgniter Features

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 9233d99c8..c767d34ba 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -111,7 +111,7 @@ Previous Topic:  CodeIgniter CheatsheetsUser Guide Home   ·   Next Topic:  Application Flow Chart

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 3be8fe34a..be65a26f3 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -85,7 +85,7 @@ our Wiki to see code examples posted User Guide Home   ·   Next Topic:  CodeIgniter At a Glance

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index e2ceb4c10..b9ba7cb15 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -91,7 +91,7 @@ Previous Topic:  Model-View-Controller User Guide Home   ·   Next Topic:  Getting Started

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 37b202394..c49cf3d43 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -77,7 +77,7 @@ Introduction diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index ec3267770..ac6c4cb12 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -93,7 +93,7 @@ Previous Topic:  Application Flow Chart User Guide Home   ·   Next Topic:  Architectural Goals

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/toc.html b/user_guide/toc.html index 1aaaa7325..1ab78cf89 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -221,7 +221,7 @@ Table of Contents diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index 9eab7b722..359323444 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -84,7 +84,7 @@ Previous Topic:  Create news itemsUser Guide Home   ·   Next Topic:  CodeIgniter URLs

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 5f1b83083..d7527da2b 100644 --- a/user_guide/tutorial/create_news_items.html +++ b/user_guide/tutorial/create_news_items.html @@ -172,7 +172,7 @@ Previous Topic:  News section User Guide Home   ·   Next Topic:  Conclusion

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html index 0c84fecf0..378947db2 100644 --- a/user_guide/tutorial/hard_coded_pages.html +++ b/user_guide/tutorial/hard_coded_pages.html @@ -151,7 +151,7 @@ Previous Topic:  CodeIgniter CheatsheetsUser Guide Home   ·   Next Topic:  Application Flow Chart

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

        diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index ed7255291..72d53cdaf 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -94,7 +94,7 @@ Previous Topic:  Goals User Guide Home   ·   Next Topic:  Static pages

        -

        CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

        +

        CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

    diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index 52d34c256..e6b98a388 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -223,8 +223,8 @@ Previous Topic:  Static pages User Guide Home   ·   Next Topic:  Create news items

    -

    CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

    - + \ No newline at end of file diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index 1c0699f64..ca17380ca 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -199,8 +199,8 @@ Previous Topic:  Introduction User Guide Home   ·   Next Topic:  News section

    -

    CodeIgniter  ·  Copyright © 2006 - 2012  ·  EllisLab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006 - 2014  ·  EllisLab, Inc.

    - + \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 112ca54907044ac362df9a6eb0c31da0c8403d73 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 31 May 2014 20:30:24 +0300 Subject: Add Travis-CI exception for 2.2-stable branch --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b3456f3a8..43cfb824e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ branches: except: - 2.1-stable + - 2.2-stable - master \ No newline at end of file -- cgit v1.2.3-24-g4f1b From b4c693c50f54ecce1d0e2c1f203312f4bbb4af22 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 31 May 2014 20:39:13 +0300 Subject: Fix broken changelog entries --- user_guide/changelog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 74f419bdf..4b3145754 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,10 +70,10 @@ Change Log

    Bug fixes for 2.2.0:

      -
    • Fixed an edge case (#2583) in the Email Library where Email Library where Suhosin blocked messages sent via mail() due to trailing newspaces in headers.
    • Fixed a bug (#696) - make oci_execute() calls inside num_rows() non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
    • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() produced broken SQL for tge 'sqlsrv' driver.
      • -
    • Fixed a bug (#2427) - PDO Database driver didn't properly check for query failures.

    Version 2.1.4

    -- cgit v1.2.3-24-g4f1b From 916b176594bcf175417423f33711ac0cbb4082e7 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 31 May 2014 21:00:05 +0300 Subject: Backport HMAC authentication for CI_Session --- system/libraries/Session.php | 56 +++++++++++++++++++++++++++----------------- user_guide/changelog.html | 4 +++- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 53b914fbd..89c699765 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -144,24 +144,36 @@ class CI_Session { return FALSE; } - // Decrypt the cookie data - if ($this->sess_encrypt_cookie == TRUE) + // HMAC authentication + if (($len = strlen($session) - 40) <= 0) { - $session = $this->CI->encrypt->decode($session); + log_message('error', 'Session: The session cookie was not signed.'); + return FALSE; } - else + + // Check cookie authentication + $hmac = substr($session, $len); + $session = substr($session, 0, $len); + + // Time-attack-safe comparison + $hmac_check = hash_hmac('sha1', $session, $this->encryption_key); + $diff = 0; + for ($i = 0; $i < 40; $i++) { - // encryption was not used, so we need to check the md5 hash - $hash = substr($session, strlen($session)-32); // get last 32 chars - $session = substr($session, 0, strlen($session)-32); + $diff |= ord($hmac[$i]) ^ ord($hmac_check[$i]); + } - // Does the md5 hash match? This is to prevent manipulation of session data in userspace - if ($hash !== md5($session.$this->encryption_key)) - { - log_message('error', 'The session cookie data did not match what was expected. This could be a possible hacking attempt.'); - $this->sess_destroy(); - return FALSE; - } + if ($diff !== 0) + { + log_message('error', 'Session: HMAC mismatch. The session cookie data did not match what was expected.'); + $this->sess_destroy(); + return FALSE; + } + + // Decrypt the cookie data + if ($this->sess_encrypt_cookie == TRUE) + { + $session = $this->CI->encrypt->decode($session); } // Unserialize the session array @@ -659,20 +671,20 @@ class CI_Session { else { // if encryption is not used, we provide an md5 hash to prevent userside tampering - $cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key); + $cookie_data .= hash_hmac('sha1', $cookie_data, $this->encryption_key); } $expire = ($this->sess_expire_on_close === TRUE) ? 0 : $this->sess_expiration + time(); // Set the cookie setcookie( - $this->sess_cookie_name, - $cookie_data, - $expire, - $this->cookie_path, - $this->cookie_domain, - $this->cookie_secure - ); + $this->sess_cookie_name, + $cookie_data, + $expire, + $this->cookie_path, + $this->cookie_domain, + $this->cookie_secure + ); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4b3145754..ff6603d8b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,7 +63,8 @@ Change Log
    • General Changes
        -
      • Security: The xor_encode() method in the Encyption Class has been removed. The Encryption Class now requires the Mcrypt extension to be installed.
        • +
      • Security: The xor_encode() method in the Encrypt Class has been removed. The Encrypt Class now requires the Mcrypt extension to be installed.
        • +
      • Security: The Session Library now uses HMAC authentication instead of a simple MD5 checksum.
    @@ -74,6 +75,7 @@ Change Log
  • Fixed a bug (#696) - make oci_execute() calls inside num_rows() non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
  • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() produced broken SQL for tge 'sqlsrv' driver.
  • Fixed a bug (#2427) - PDO Database driver didn't properly check for query failures.
    • +
  • Fixed a bug in the Session Library where authentication was not performed for encrypted cookies.

    • Version 2.1.4

    -- cgit v1.2.3-24-g4f1b