summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-11-27 20:12:12 +0100
committerEric Barnes <eric@ericlbarnes.com>2011-11-27 20:12:12 +0100
commitc836978e257bdba0827ab7506c890c6b7b223879 (patch)
tree4719d2dbbba0e95c1c0f16526cb757ba0658c827 /system
parent32b6780d6e75a39e62784cec998ee2b5f69ee77e (diff)
parent21fc2b624bca91d61cb3491cf7b93edfcf6ab80f (diff)
Merge branch 'refs/heads/develop' into feature/unit-tests
Diffstat (limited to 'system')
-rwxr-xr-xsystem/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 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\" " : "";