summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-10-06 16:41:47 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-10-06 16:41:47 +0200
commitdbc9e15c814ad2fc8a3fb10fbd1350d42b1f7f9c (patch)
treee5e58fac44f618b19ce54ab2028a5edd92554239 /system
parent9af2ec4d32deb49282587b45d2a02446a6400b19 (diff)
Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
Diffstat (limited to 'system')
-rw-r--r--system/helpers/url_helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 121b36b97..acf889007 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -400,7 +400,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 < sizeof($matches['0']); $i++)
{