Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into has2k1-patch-1

Conflicts:
	user_guide_src/source/changelog.rst

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\" " : "";