aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-05 21:41:58 -0700
committerfriendica <info@friendica.com>2012-08-05 21:41:58 -0700
commitc673c70c25143f18b2ef6aef9ee6633d0eac46ae (patch)
treea5e242bc114a08cd7a46868e56f5159075f3e7fe /include/bb2diaspora.php
parent4f645992100a9c2a9877548b37cf4f78b4c6a160 (diff)
downloadvolse-hubzilla-c673c70c25143f18b2ef6aef9ee6633d0eac46ae.tar.gz
volse-hubzilla-c673c70c25143f18b2ef6aef9ee6633d0eac46ae.tar.bz2
volse-hubzilla-c673c70c25143f18b2ef6aef9ee6633d0eac46ae.zip
updates
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index b95dee8f3..9ede42f6c 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -202,9 +202,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// the following was added on 10-January-2012 due to an inability of Diaspora's
// new javascript markdown processor to handle links with images as the link "text"
// It is not optimal and may be removed if this ability is restored in the future
- if ($fordiaspora)
- $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
- "[url]$1[/url]\n[img]$2[/img]", $Text);
+ //if ($fordiaspora)
+ // $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
+ // "[url]$1[/url]\n[img]$2[/img]", $Text);
// Convert it to HTML - don't try oembed
$Text = bbcode($Text, $preserve_nl, false);