From ebfc48a9ee05dbd96a372894ab65f6287fe6c398 Mon Sep 17 00:00:00 2001 From: ftwbzhao Date: Thu, 9 Apr 2015 22:34:27 +0800 Subject: add changelog for #3744 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 8fa4d1ef1..04a0aa55a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -15,6 +15,7 @@ Bug fixes for 3.0.1 ------------------- - Fixed a bug (#3733) - Autoloading of libraries with aliases didn't work, although it was advertised to. +- Fixed a bug (#3744) - Redis :doc:`Caching ` driver didn't handle authentication failures properly. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From c14aa9bcca4b5876f2bf46bbe9eb4c7d3e0e013a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sun, 12 Apr 2015 14:23:47 +0300 Subject: Close #3761 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 04a0aa55a..94a383294 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -16,6 +16,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3733) - Autoloading of libraries with aliases didn't work, although it was advertised to. - Fixed a bug (#3744) - Redis :doc:`Caching ` driver didn't handle authentication failures properly. +- Fixed a bug (#3761) - :doc:`URL Helper ` function :php:func:`anchor()` didn't work with array inputs. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 8af87468487101e14e69effb80a166870f1b79be Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 14 Apr 2015 15:59:54 +0300 Subject: Fix #3773 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 94a383294..596cd0faf 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -17,6 +17,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3733) - Autoloading of libraries with aliases didn't work, although it was advertised to. - Fixed a bug (#3744) - Redis :doc:`Caching ` driver didn't handle authentication failures properly. - Fixed a bug (#3761) - :doc:`URL Helper ` function :php:func:`anchor()` didn't work with array inputs. +- Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database ` driver. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 5d8e2a6e4c50b772f4b789ea5d831f47c45dc851 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 14 Apr 2015 16:56:28 +0300 Subject: Fix #3771 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 596cd0faf..5454638ac 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -18,6 +18,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3744) - Redis :doc:`Caching ` driver didn't handle authentication failures properly. - Fixed a bug (#3761) - :doc:`URL Helper ` function :php:func:`anchor()` didn't work with array inputs. - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database ` driver. +- Fixed a bug (#3771) - :doc:`Form Validation Library ` was looking for a 'form_validation_' prefix when trying to translate field name labels. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From d3913f591353d17954ee900f2524f24c1833af85 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 20 Apr 2015 14:47:00 +0300 Subject: Fix #3787 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 5454638ac..ae8dde6f9 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -19,6 +19,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3761) - :doc:`URL Helper ` function :php:func:`anchor()` didn't work with array inputs. - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database ` driver. - Fixed a bug (#3771) - :doc:`Form Validation Library ` was looking for a 'form_validation_' prefix when trying to translate field name labels. +- Fixed a bug (#3787) - :doc:`FTP Library ` method ``delete_dir()`` failed when the target has subdirectories. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 67c1e222c5312d064b987d899d29cb619fd7bd71 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Fri, 24 Apr 2015 13:30:23 +0300 Subject: A changelog update. --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index ae8dde6f9..28b92f23a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -20,6 +20,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database ` driver. - Fixed a bug (#3771) - :doc:`Form Validation Library ` was looking for a 'form_validation_' prefix when trying to translate field name labels. - Fixed a bug (#3787) - :doc:`FTP Library ` method ``delete_dir()`` failed when the target has subdirectories. +- Fixed a bug (#3801) - :doc: The `Output class ` method ``_display_cache()`` assigned incorrect timestamps. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 28fc4c7a4aecce433b29ca7bb027130a529fb262 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Fri, 24 Apr 2015 13:32:49 +0300 Subject: A changelog update 2. --- user_guide_src/source/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 28b92f23a..18aeac8c0 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -20,7 +20,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database ` driver. - Fixed a bug (#3771) - :doc:`Form Validation Library ` was looking for a 'form_validation_' prefix when trying to translate field name labels. - Fixed a bug (#3787) - :doc:`FTP Library ` method ``delete_dir()`` failed when the target has subdirectories. -- Fixed a bug (#3801) - :doc: The `Output class ` method ``_display_cache()`` assigned incorrect timestamps. +- Fixed a bug (#3801) - :doc: The `Output class ` method ``_display_cache()`` failed to read timestamps correctly. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From d593535a2a80c7e1a13e31b6fe94684b42e8a306 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Fri, 24 Apr 2015 13:57:01 +0300 Subject: A changelog update 3. --- user_guide_src/source/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 18aeac8c0..cda5d319e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -20,7 +20,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database ` driver. - Fixed a bug (#3771) - :doc:`Form Validation Library ` was looking for a 'form_validation_' prefix when trying to translate field name labels. - Fixed a bug (#3787) - :doc:`FTP Library ` method ``delete_dir()`` failed when the target has subdirectories. -- Fixed a bug (#3801) - :doc: The `Output class ` method ``_display_cache()`` failed to read timestamps correctly. +- Fixed a bug (#3801) - :doc:`Output Library ` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 7eedc63baae068b139256ee2369d43189e93fa7e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 29 Apr 2015 15:43:46 +0900 Subject: Fix migration_version --- user_guide_src/source/libraries/migration.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/libraries/migration.rst b/user_guide_src/source/libraries/migration.rst index 25be0c93c..9eb9b78b1 100644 --- a/user_guide_src/source/libraries/migration.rst +++ b/user_guide_src/source/libraries/migration.rst @@ -88,7 +88,7 @@ as *20121031100537_add_blog.php*. } } -Then in **application/config/migration.php** set ``$config['migration_version'] = 1;``. +Then in **application/config/migration.php** set ``$config['migration_version'] = 20121031100537;``. ************* Usage Example @@ -181,4 +181,4 @@ Class Reference specific versions. It works just like ``current()`` but ignores ``$config['migration_version']``. :: - $this->migration->version(5); \ No newline at end of file + $this->migration->version(5); -- cgit v1.2.3-24-g4f1b From b137d232ef895cc47da4e39dfcb7c9078ba6be2b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 29 Apr 2015 11:44:38 +0300 Subject: Fix #3816 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index cda5d319e..a3e1dc44a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -21,6 +21,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3771) - :doc:`Form Validation Library ` was looking for a 'form_validation_' prefix when trying to translate field name labels. - Fixed a bug (#3787) - :doc:`FTP Library ` method ``delete_dir()`` failed when the target has subdirectories. - Fixed a bug (#3801) - :doc:`Output Library ` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. +- Fixed a bug (#3816) - :doc:`Form Validation Library ` treated empty string values as non-existing ones. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 0f8509025d2338dc069ddf42b6ade974a5da0ca3 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 29 Apr 2015 12:33:11 +0300 Subject: Add list_fields() support for SQLite3 --- user_guide_src/source/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index a3e1dc44a..2fc50b956 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -11,6 +11,10 @@ Release Date: Not Released - Added DoS mitigation to :php:func:`hash_pbkdf2()` :doc:`compatibility function `. +- Database + + - Added ``list_fields()`` support for SQLite ('sqlite3' and 'pdo_sqlite' drivers). + Bug fixes for 3.0.1 ------------------- -- cgit v1.2.3-24-g4f1b From 12617cf6602164a1b43a71aa8fc7c3571881d3be Mon Sep 17 00:00:00 2001 From: Master Yoda Date: Thu, 30 Apr 2015 02:32:59 -0700 Subject: Fix typos in user guide. Corrected "csrf_regenerate" in libraries/security.rst (it read "csrf_regeneration", incorrect per source code). Corrected "blog" as default controller in general/controllers.rst (it read "Blog", not per convention). --- user_guide_src/source/general/controllers.rst | 2 +- user_guide_src/source/libraries/security.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst index bc8319dd8..7ab5a7f6a 100644 --- a/user_guide_src/source/general/controllers.rst +++ b/user_guide_src/source/general/controllers.rst @@ -138,7 +138,7 @@ present, as will be the case when only your site root URL is requested. To specify a default controller, open your **application/config/routes.php** file and set this variable:: - $route['default_controller'] = 'Blog'; + $route['default_controller'] = 'blog'; Where Blog is the name of the controller class you want used. If you now load your main index.php file without specifying any URI segments you'll diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst index ac56fc589..16b397994 100644 --- a/user_guide_src/source/libraries/security.rst +++ b/user_guide_src/source/libraries/security.rst @@ -88,7 +88,7 @@ may alter this behavior by editing the following config parameter :: - $config['csrf_regeneration'] = TRUE; + $config['csrf_regenerate'] = TRUE; Select URIs can be whitelisted from csrf protection (for example API endpoints expecting externally POSTed content). You can add these URIs -- cgit v1.2.3-24-g4f1b From 73b9e851a96dcafc0c07a0d0480853e31ba48e59 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 30 Apr 2015 13:06:40 +0300 Subject: Fix #3823 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2fc50b956..2d10f8f96 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -26,6 +26,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3787) - :doc:`FTP Library ` method ``delete_dir()`` failed when the target has subdirectories. - Fixed a bug (#3801) - :doc:`Output Library ` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. - Fixed a bug (#3816) - :doc:`Form Validation Library ` treated empty string values as non-existing ones. +- Fixed a bug (#3823) - :doc:`Session Library ` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 06a69ecd0d134c95a5190980ccae920bd08be67b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 2 May 2015 16:32:03 +0300 Subject: [ci skip] Fix a doc link causing a Sphinx compile warning --- user_guide_src/source/overview/features.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/overview/features.rst b/user_guide_src/source/overview/features.rst index b230be9a3..f62546b61 100644 --- a/user_guide_src/source/overview/features.rst +++ b/user_guide_src/source/overview/features.rst @@ -8,8 +8,8 @@ how intuitively or intelligently it is designed. Features don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices. The only way to really judge an app is to try it and get to know the code. -:doc:`Installing <../installation/>`_ CodeIgniter is child's play so we -encourage you to do just that. In the mean time here's a list of +:doc:`Installing <../installation/index>` CodeIgniter is child's play so +we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features. - Model-View-Controller Based System -- cgit v1.2.3-24-g4f1b From 8cb6f3676ccf84c9c12e056cc93caa767cd16ccd Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 2 May 2015 16:35:51 +0300 Subject: [ci skip] Fix timezones list in date helper docs Close #3818 --- user_guide_src/source/helpers/date_helper.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst index e0f9f0033..a85da26a4 100644 --- a/user_guide_src/source/helpers/date_helper.rst +++ b/user_guide_src/source/helpers/date_helper.rst @@ -400,7 +400,7 @@ UM10 (UTC - 10:00) Hawaii-Aleutian Standard Time, Cook Islands UM95 (UTC - 09:30) Marquesas Islands UM9 (UTC - 09:00) Alaska Standard Time, Gambier Islands UM8 (UTC - 08:00) Pacific Standard Time, Clipperton Island -UM7 (UTC - 11:00) Mountain Standard Time +UM7 (UTC - 07:00) Mountain Standard Time UM6 (UTC - 06:00) Central Standard Time UM5 (UTC - 05:00) Eastern Standard Time, Western Caribbean UM45 (UTC - 04:30) Venezuelan Standard Time -- cgit v1.2.3-24-g4f1b From f5327360296980a4396b69d3deaa9f330fba75f8 Mon Sep 17 00:00:00 2001 From: ftwbzhao Date: Wed, 6 May 2015 19:34:57 +0800 Subject: update apc link --- user_guide_src/source/libraries/caching.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index f54de5faf..1fc1b5bfb 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -18,7 +18,7 @@ requirements are not met. Example Usage ************* -The following example will load the cache driver, specify `APC <#apc>`_ +The following example will load the cache driver, specify `APC <#alternative-php-cache-apc-caching>`_ as the driver to use, and fall back to file-based caching if APC is not available in the hosting environment. -- cgit v1.2.3-24-g4f1b From 170ae282338584ebe257d2fb21101ccf84a3f800 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 7 May 2015 10:43:28 +0300 Subject: Issue/PR #3836 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2d10f8f96..c5010b61a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -27,6 +27,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3801) - :doc:`Output Library ` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. - Fixed a bug (#3816) - :doc:`Form Validation Library ` treated empty string values as non-existing ones. - Fixed a bug (#3823) - :doc:`Session Library ` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds. +- Fixed a bug (#3836) - :doc:`Cache Library ` methods ``increment()``, ``decrement()`` didn't work with an offset other than 1 for the Redis driver. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 70f738a14b0f6f70d9292c0f488ea423a76f438e Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 7 May 2015 12:16:33 +0300 Subject: Revert "Issue/PR #3836" This reverts commit 170ae282338584ebe257d2fb21101ccf84a3f800. --- user_guide_src/source/changelog.rst | 1 - 1 file changed, 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index c5010b61a..2d10f8f96 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -27,7 +27,6 @@ Bug fixes for 3.0.1 - Fixed a bug (#3801) - :doc:`Output Library ` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. - Fixed a bug (#3816) - :doc:`Form Validation Library ` treated empty string values as non-existing ones. - Fixed a bug (#3823) - :doc:`Session Library ` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds. -- Fixed a bug (#3836) - :doc:`Cache Library ` methods ``increment()``, ``decrement()`` didn't work with an offset other than 1 for the Redis driver. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From c836f2af72536733fa1cc990b46522b9ef16153e Mon Sep 17 00:00:00 2001 From: ftwbzhao Date: Thu, 7 May 2015 18:05:33 +0800 Subject: update userguide --- user_guide_src/source/database/utilities.rst | 4 ++-- user_guide_src/source/general/reserved_names.rst | 1 + user_guide_src/source/libraries/caching.rst | 2 +- user_guide_src/source/libraries/config.rst | 4 ++-- user_guide_src/source/tutorial/create_news_items.rst | 4 ++-- user_guide_src/source/tutorial/news_section.rst | 10 +++++----- user_guide_src/source/tutorial/static_pages.rst | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index cc4aeb018..81b949dd7 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -18,7 +18,7 @@ Initializing the Utility Class Load the Utility Class as follows:: - $this->load->dbutil() + $this->load->dbutil(); You can also pass another database object to the DB Utility loader, in case the database you want to manage isn't the default one:: @@ -35,7 +35,7 @@ assigning it directly to ``$this->dbutil``. Once initialized you will access the methods using the ``$this->dbutil`` object:: - $this->dbutil->some_method() + $this->dbutil->some_method(); **************************** Using the Database Utilities diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst index a7b0c3465..5d745cba6 100644 --- a/user_guide_src/source/general/reserved_names.rst +++ b/user_guide_src/source/general/reserved_names.rst @@ -75,6 +75,7 @@ Constants - FOPEN_READ_WRITE_CREATE - FOPEN_WRITE_CREATE_STRICT - FOPEN_READ_WRITE_CREATE_STRICT +- SHOW_DEBUG_BACKTRACE - EXIT_SUCCESS - EXIT_ERROR - EXIT_CONFIG diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 1fc1b5bfb..a7081ec6b 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -66,7 +66,7 @@ Class Reference hosting environment. :: - if ($this->cache->apc->is_supported() + if ($this->cache->apc->is_supported()) { if ($data = $this->cache->apc->get('my_cache')) { diff --git a/user_guide_src/source/libraries/config.rst b/user_guide_src/source/libraries/config.rst index 3138e3403..a45cacdf5 100644 --- a/user_guide_src/source/libraries/config.rst +++ b/user_guide_src/source/libraries/config.rst @@ -92,9 +92,9 @@ Fetching Config Items To retrieve an item from your config file, use the following function:: - $this->config->item('item name'); + $this->config->item('item_name'); -Where item name is the $config array index you want to retrieve. For +Where item_name is the $config array index you want to retrieve. For example, to fetch your language choice you'll do this:: $lang = $this->config->item('language'); diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst index 71d2080af..5c5270472 100644 --- a/user_guide_src/source/tutorial/create_news_items.rst +++ b/user_guide_src/source/tutorial/create_news_items.rst @@ -18,11 +18,11 @@ application/views/news/create.php. :: -

+

- +
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst index d8ebac4a3..688f2cb19 100644 --- a/user_guide_src/source/tutorial/news_section.rst +++ b/user_guide_src/source/tutorial/news_section.rst @@ -143,17 +143,17 @@ and add the next piece of code. :: -

+

-

+

- +
-

View article

+

View article

- + Here, each news item is looped and displayed to the user. You can see we wrote our template in PHP mixed with HTML. If you prefer to use a diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 62b3469ad..e948d3011 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -64,7 +64,7 @@ following code. -

+

The header contains the basic HTML code that you'll want to display before loading the main view, together with a heading. It will also -- cgit v1.2.3-24-g4f1b From fbde2798688ab99cfe3fdd22746d60f0877b2c27 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 11 May 2015 11:03:06 +0300 Subject: Fix #3846 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2d10f8f96..185a17af4 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -27,6 +27,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3801) - :doc:`Output Library ` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. - Fixed a bug (#3816) - :doc:`Form Validation Library ` treated empty string values as non-existing ones. - Fixed a bug (#3823) - :doc:`Session Library ` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds. +- Fixed a bug (#3846) - :doc:`Image Manipulation Library ` method `image_mirror_gd()` didn't properly initialize its variables. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From 60b69669e19304759e36121b1261473fc560f243 Mon Sep 17 00:00:00 2001 From: Rodolfo Silva Date: Mon, 11 May 2015 11:39:18 -0300 Subject: Adding validation not documented. --- user_guide_src/source/libraries/form_validation.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/libraries/form_validation.rst b/user_guide_src/source/libraries/form_validation.rst index da43a4bec..dbf1e8a63 100644 --- a/user_guide_src/source/libraries/form_validation.rst +++ b/user_guide_src/source/libraries/form_validation.rst @@ -946,6 +946,7 @@ Rule Parameter Description ========================= ========== ============================================================================================= ======================= **required** No Returns FALSE if the form element is empty. **matches** Yes Returns FALSE if the form element does not match the one in the parameter. matches[form_item] +**regex_match** Yes Returns FALSE if the form element does not match the regular expression. regex_match[/regex/] **differs** Yes Returns FALSE if the form element does not differ from the one in the parameter. differs[form_item] **is_unique** Yes Returns FALSE if the form element is not unique to the table and field name in the is_unique[table.field] parameter. Note: This rule requires :doc:`Query Builder <../database/query_builder>` to be -- cgit v1.2.3-24-g4f1b From 7d19161c1d596c379e72c40daec290ce6f5f16b6 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 13 May 2015 11:20:44 +0300 Subject: [ci skip] Fix an erroneous doc link Close #3851 --- user_guide_src/source/general/environments.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index f5a4f617e..7f030b6ef 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -48,5 +48,5 @@ Configuration Files Optionally, you can have CodeIgniter load environment-specific configuration files. This may be useful for managing things like differing API keys across multiple environments. This is described in -more detail in the environment section of the :doc:`Config -Class <../libraries/config#environments>`_ documentation. \ No newline at end of file +more detail in the environment section of the :doc:`Config Class +<../libraries/config>`_ documentation. \ No newline at end of file -- cgit v1.2.3-24-g4f1b From dee92a039aca627b55a8c0ed131f4d97dcc7223e Mon Sep 17 00:00:00 2001 From: Leandro Mangini Antunes Date: Wed, 13 May 2015 11:55:13 -0300 Subject: Update changelog.rst --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 185a17af4..f9fe93903 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -18,6 +18,7 @@ Release Date: Not Released Bug fixes for 3.0.1 ------------------- +- Fixed a bug (#3854) - Using field_data() on Oracle databases - Fixed a bug (#3733) - Autoloading of libraries with aliases didn't work, although it was advertised to. - Fixed a bug (#3744) - Redis :doc:`Caching ` driver didn't handle authentication failures properly. - Fixed a bug (#3761) - :doc:`URL Helper ` function :php:func:`anchor()` didn't work with array inputs. -- cgit v1.2.3-24-g4f1b From 56514f1de740ff72198228a10deab8f9da2dfe13 Mon Sep 17 00:00:00 2001 From: Leandro Mangini Antunes Date: Wed, 13 May 2015 12:53:21 -0300 Subject: Update changelog.rst --- user_guide_src/source/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f9fe93903..15be738d6 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -18,7 +18,6 @@ Release Date: Not Released Bug fixes for 3.0.1 ------------------- -- Fixed a bug (#3854) - Using field_data() on Oracle databases - Fixed a bug (#3733) - Autoloading of libraries with aliases didn't work, although it was advertised to. - Fixed a bug (#3744) - Redis :doc:`Caching ` driver didn't handle authentication failures properly. - Fixed a bug (#3761) - :doc:`URL Helper ` function :php:func:`anchor()` didn't work with array inputs. @@ -29,6 +28,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3816) - :doc:`Form Validation Library ` treated empty string values as non-existing ones. - Fixed a bug (#3823) - :doc:`Session Library ` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds. - Fixed a bug (#3846) - :doc:`Image Manipulation Library ` method `image_mirror_gd()` didn't properly initialize its variables. +- Fixed a bug (#3854) - `field_data()` didn't work properly with the Oracle (OCI8) database driver. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b