diff options
author | Friendika <info@friendika.com> | 2011-02-20 20:20:33 -0800 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-02-20 20:20:33 -0800 |
commit | ee35c06a8d138d14f1bf7c0d7fb710721709c3a9 (patch) | |
tree | 697fc479f01b6bfbf989e45366237da600e32ebb | |
parent | d609e75b07d6ba0d0867c6bce78b90b7f488923c (diff) | |
download | volse-hubzilla-ee35c06a8d138d14f1bf7c0d7fb710721709c3a9.tar.gz volse-hubzilla-ee35c06a8d138d14f1bf7c0d7fb710721709c3a9.tar.bz2 volse-hubzilla-ee35c06a8d138d14f1bf7c0d7fb710721709c3a9.zip |
more punctuation characters added to linkify patterns
-rw-r--r-- | boot.php | 2 | ||||
-rw-r--r-- | include/bbcode.php | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -2060,7 +2060,7 @@ function aes_encrypt($val,$ky) if(! function_exists('linkify')) { function linkify($s) { - $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" target="external-link">$1</a>', $s); + $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="external-link">$1</a>', $s); return($s); }} diff --git a/include/bbcode.php b/include/bbcode.php index c55ebab00..978b4af69 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -22,7 +22,7 @@ function bbcode($Text) { // Perform URL Search - $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!]+)/", ' <a href="$2" target="external-link">$2</a>', $Text); + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]+)/", ' <a href="$2" target="external-link">$2</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text); |