diff options
| author | friendica <info@friendica.com> | 2015-03-18 19:06:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-18 19:06:05 -0700 |
| commit | 63683734a21e90149c464f7e9b03e7aedc29868e (patch) | |
| tree | 5b58e4d227da6638f7a841a5b62a080646e53bba /include/text.php | |
| parent | 5a7e35fbf8e70f04e4253e5cc2a79925cd3385d1 (diff) | |
| download | volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.tar.gz volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.tar.bz2 volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.zip | |
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 7468a3622..54d8b2ad7 100644 --- a/include/text.php +++ b/include/text.php @@ -869,7 +869,7 @@ function valid_email($x){ function linkify($s,$me = false) { - $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+]*)/", (($me) ? ' <a href="$1" rel="me" >$1</a>' : ' <a href="$1" >$1</a>'), $s); + $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+\,\@]*)/", (($me) ? ' <a href="$1" rel="me" >$1</a>' : ' <a href="$1" >$1</a>'), $s); $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); return($s); } |