aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorZach Prezkuta <fermion@gmx.com>2012-06-23 22:02:08 -0600
committerZach Prezkuta <fermion@gmx.com>2012-06-23 22:02:08 -0600
commit5d2eed35177da3debacc6db6db2f7a74bc4b64c7 (patch)
treeb6fa2c8ef826faf0133398a66a75031a526ec768 /include/bb2diaspora.php
parent098c74a12a7b370ccd9ca6d10987feac4b0d61d3 (diff)
downloadvolse-hubzilla-5d2eed35177da3debacc6db6db2f7a74bc4b64c7.tar.gz
volse-hubzilla-5d2eed35177da3debacc6db6db2f7a74bc4b64c7.tar.bz2
volse-hubzilla-5d2eed35177da3debacc6db6db2f7a74bc4b64c7.zip
allow bare URLS to make it through to Diaspora
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 75ba57dff..ac693127b 100644
--- 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);