summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Paul Searles <daniel@treemoinc.com>2012-11-03 01:58:57 +0100
committerDaniel Paul Searles <daniel@treemoinc.com>2012-11-03 01:58:57 +0100
commit3aca5695b2b8561986d11e20e6da46f9b32060f1 (patch)
treeb3e6e09d4e3f366fc6efb81c9636bd25a4e4f4f3
parentd2ae1d1d7fdc4b8a21369a25487c2c42e5a496bf (diff)
parent28daadeca8ebc889fd799ed8bb58293ebeb4fabd (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
-rw-r--r--user_guide_src/source/changelog.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a7ff0d2bb..abb75f579 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -413,7 +413,7 @@ Bug fixes for 3.0
- Fixed a bug (#1938) - :doc:`Email Library <libraries/email>` removed multiple spaces inside a pre-formatted plain text message.
- Fixed a bug (#388, #705) - :doc:`URI Library <libraries/uri>` didn't apply URL-decoding to URI segments that it got from **REQUEST_URI** and/or **QUERY_STRING**.
- Fixed a bug (#122) - :doc:`URI Library <libraries/uri>` method ``ruri_string()`` didn't include a directory if one is used.
-- Fixed a bug - :doc:`Routing Library <general/routing>` didn't properly handle *404_override* in a subdirectory when a method is also specified.
+- Fixed a bug - :doc:`Routing Library <general/routing>` didn't properly handle *default_controller* in a subdirectory when a method is also specified.
- Fixed a bug (#953) - :doc:`post_controller_constructor hook <general/hooks>` wasn't called with a *404_override*.
Version 2.1.3