summaryrefslogtreecommitdiffstats
path: root/system/helpers/url_helper.php
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-11-27 20:09:07 +0100
committerEric Barnes <eric@ericlbarnes.com>2011-11-27 20:09:07 +0100
commit21fc2b624bca91d61cb3491cf7b93edfcf6ab80f (patch)
treed9888e656906bc675ad86748605d9d693b7267a0 /system/helpers/url_helper.php
parentbc204813956771e83d10c3b04e22bb5874938a99 (diff)
parent9001a882424aaf4edc67552d3beecb9283fa1bdd (diff)
Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into has2k1-patch-1
Conflicts: user_guide_src/source/changelog.rst
Diffstat (limited to 'system/helpers/url_helper.php')
-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\" " : "";