summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-02-10 19:56:01 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-02-10 19:56:01 +0100
commit0b2145f96b6c05aefb51cccb643d203b83a0d761 (patch)
tree078ebcc0d50110ee42a49b8cfa98575cf5984052 /system
parent534be03fdc52bdaeb48ffe89cb6aa042ad1890ad (diff)
Added trailing periods as characters to be removed in url_title()
Removed an extraneous Å character from the file that crept in from somewhere
Diffstat (limited to 'system')
-rw-r--r--system/helpers/url_helper.php5
1 files changed, 3 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);