diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 20:12:12 +0100 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 20:12:12 +0100 |
| commit | c836978e257bdba0827ab7506c890c6b7b223879 (patch) | |
| tree | 4719d2dbbba0e95c1c0f16526cb757ba0658c827 /user_guide_src | |
| parent | 32b6780d6e75a39e62784cec998ee2b5f69ee77e (diff) | |
| parent | 21fc2b624bca91d61cb3491cf7b93edfcf6ab80f (diff) | |
Merge branch 'refs/heads/develop' into feature/unit-tests
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 8 | ||||
| -rw-r--r-- | user_guide_src/source/helpers/string_helper.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index dff4f001d..979755c06 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -35,8 +35,8 @@ Release Date: Not Released - Database - - Added new :doc:`Active Record <database/active_record>` methods that return - the SQL string of queries without executing them: get_compiled_select(), + - Added new :doc:`Active Record <database/active_record>` methods that return + the SQL string of queries without executing them: get_compiled_select(), get_compiled_insert(), get_compiled_update(), get_compiled_delete(). - Libraries @@ -45,7 +45,7 @@ Release Date: Not Released - CI_Loader::_ci_autoloader() is now a protected method. - Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library <libraries/form_validation>`. - Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname) - + - Core - Changed private functions in CI_URI to protected so MY_URI can @@ -59,7 +59,7 @@ Bug fixes for 3.0 - Fixed a bug (#181) where a mis-spelling was in the form validation language file. - Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented. - +- Bug #419 - auto_link() now recognizes URLs that come after a word boundary. Version 2.1.0 ============= diff --git a/user_guide_src/source/helpers/string_helper.rst b/user_guide_src/source/helpers/string_helper.rst index b8a69e036..dc70e461a 100644 --- a/user_guide_src/source/helpers/string_helper.rst +++ b/user_guide_src/source/helpers/string_helper.rst @@ -58,7 +58,7 @@ Usage example echo increment_string('file', '_'); // "file_1" echo increment_string('file', '-', 2); // "file-2" - echo increment_string('file-4'); // "file-5" + echo increment_string('file_4'); // "file_5" alternator() ============ |