diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 20:09:07 +0100 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 20:09:07 +0100 |
| commit | 21fc2b624bca91d61cb3491cf7b93edfcf6ab80f (patch) | |
| tree | d9888e656906bc675ad86748605d9d693b7267a0 | |
| parent | bc204813956771e83d10c3b04e22bb5874938a99 (diff) | |
| parent | 9001a882424aaf4edc67552d3beecb9283fa1bdd (diff) | |
Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into has2k1-patch-1
Conflicts:
user_guide_src/source/changelog.rst
| -rwxr-xr-x | system/helpers/url_helper.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 5d907d00e..5d9afe457 100755 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -393,7 +393,7 @@ if ( ! function_exists('auto_link')) { if ($type != 'email') { - if (preg_match_all("#(^|\s|\()((http(s?)://)|(www\.))(\w+[^\s\)\<]+)#i", $str, $matches)) + if (preg_match_all("#(^|\s|\(|\b)((http(s?)://)|(www\.))(\w+[^\s\)\<]+)#i", $str, $matches)) { $pop = ($popup == TRUE) ? " target=\"_blank\" " : ""; 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 ============= |