diff options
| -rw-r--r-- | system/helpers/url_helper.php | 5 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 5be43300e..958c16c4b 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -406,7 +406,7 @@ if ( ! function_exists('auto_link')) if ($type != 'url') { - if (preg_match_all("/([a-zA-Z0-9_\.\-\+Å]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) + if (preg_match_all("/([a-zA-Z0-9_\.\-\+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) { for ($i = 0; $i < count($matches['0']); $i++) { @@ -491,7 +491,8 @@ if ( ! function_exists('url_title')) '[^a-z0-9\-\._]' => '', $replace.'+' => $replace, $replace.'$' => $replace, - '^'.$replace => $replace + '^'.$replace => $replace, + '\.+$' => '' ); $str = strip_tags($str); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 48f356703..457db56a1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -129,6 +129,7 @@ SVN Revision: </p> <li>Fixed a bug (#6342) with plural() in the Inflection helper with words ending in "y".</li> <li>Fixed bug (#6517) where Routed URI segments returned by URI::rsegment() method were incorrect for the default controller.</li> <li>Fixed a bug (#6706) in the Security Helper where xss_clean() was using a deprecated second argument.</li> + <li>Fixed a bug in the URL helper url_title() function where trailing periods were allowed at the end of a URL.</li> <li>Tweaked Typography::auto_typography() for some edge-cases.</li> </ul> |