Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index d16dcb6a7fcf7417a1b3ad9d168ccf10854c52af..5b676bbadbf16adc628d37aaad9c7b7ee5789ee4 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -407,6 +407,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
        //$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
 
+       // Red compatibility, though the link can't be authenticated on Friendica
+       $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
+
+
        // we may need to restrict this further if it picks up too many strays
        // link acct:user@host to a webfinger profile redirector