aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-04-08 16:58:52 -0700
committerfriendica <info@friendica.com>2013-04-08 16:58:52 -0700
commitf5940b7ddb014cb19a90ad0a8a69d90bb84906dd (patch)
treedf8df59251cc25c3f1bcae6b849184ccefb0ad83 /include
parent989e78137edf1c8d0a85038965fb12e7bffb3e7a (diff)
downloadvolse-hubzilla-f5940b7ddb014cb19a90ad0a8a69d90bb84906dd.tar.gz
volse-hubzilla-f5940b7ddb014cb19a90ad0a8a69d90bb84906dd.tar.bz2
volse-hubzilla-f5940b7ddb014cb19a90ad0a8a69d90bb84906dd.zip
modify linkify to work correctly with Red mid's containing '@'
Diffstat (limited to 'include')
-rw-r--r--include/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index 833b495f4..a8d91fade 100644
--- a/include/text.php
+++ b/include/text.php
@@ -716,7 +716,7 @@ function valid_email($x){
function linkify($s) {
- $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" >$1</a>', $s);
+ $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+]*)/", ' <a href="$1" >$1</a>', $s);
$s = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$s);
return($s);
}