allow bare URLS to make it through to Diaspora

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 75ba57dff86d5b3a08a47802ed39a5d11f4ff9ec..ac693127ba6338789855526c4856ca46064ded12 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -131,6 +131,12 @@ function bb2diaspora($Text,$preserve_nl = false) {
        $md = new Markdownify(false, false, false);
        $Text = $md->parseString($Text);
 
+       // If the text going into bbcode() has a plain URL in it, i.e.
+       // with no [url] tags around it, it will come out of parseString()
+       // looking like: <http://url.com>, which gets removed by strip_tags().
+       // So take off the angle brackets of any such URL
+       $Text = preg_replace("/<http(.*?)>/is", "http$1", $Text);
+
        // Remove all unconverted tags
        $Text = strip_tags($Text);