From 7db4a0dd2ee631c4b0652e5852b1bb6f5ca50e63 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 11 Nov 2010 20:32:20 -0800 Subject: give orphans a second chance, linkify naked links --- include/bbcode.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/bbcode.php') diff --git a/include/bbcode.php b/include/bbcode.php index 961494b16..52ca86bc1 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -17,10 +17,15 @@ function bbcode($Text) { $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@"; // Perform URL Search + + $Text = preg_replace("/[^\]\=](http\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' $1', $Text); + $Text = preg_replace("/[^\]\=](https\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' $1', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '$1', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '$2', $Text); //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '$2', $Text); + // Perform MAIL Search $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '$1', $Text); $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.+?)\[\/mail\]/", '$2', $Text); -- cgit v1.2.3