aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-08 17:20:03 -0800
committerfriendica <info@friendica.com>2012-01-08 17:20:03 -0800
commit3bdcb5247105f41a1b436cd00727148cda2f90b9 (patch)
tree748b113641a30dd5b882e72d7e48146714ee458a /include
parent96031d0e95cb1837944bc38afb056c8fd6ebb594 (diff)
downloadvolse-hubzilla-3bdcb5247105f41a1b436cd00727148cda2f90b9.tar.gz
volse-hubzilla-3bdcb5247105f41a1b436cd00727148cda2f90b9.tar.bz2
volse-hubzilla-3bdcb5247105f41a1b436cd00727148cda2f90b9.zip
markdown bug is Diaspora's. We can't fix it.
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index cc188336b..38f5c6735 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -94,6 +94,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
// [img]pathtoimage[/img]
+// $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism",
+// '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text);
+
$Text = preg_replace("/\[bookmark\]([$URLSearchString]*)\[\/bookmark\]/ism", '[$1]($1)', $Text);
$Text = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[$2]($1)', $Text);
@@ -101,8 +104,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text);
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text);
- $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism",
- '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text);
$Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);