aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-04 16:09:34 -0700
committerfriendica <info@friendica.com>2014-06-04 16:09:34 -0700
commit6e2208394a61eb4ef0893604a60de03775fe6c86 (patch)
treeffee4ef143c33d0d7d6505b72649ab180e044d32 /include
parentd84f03d59b4b3f625b36852211698f5606b6b37c (diff)
downloadvolse-hubzilla-6e2208394a61eb4ef0893604a60de03775fe6c86.tar.gz
volse-hubzilla-6e2208394a61eb4ef0893604a60de03775fe6c86.tar.bz2
volse-hubzilla-6e2208394a61eb4ef0893604a60de03775fe6c86.zip
add zrl stuff - still a lot of new stuff missing but I'm not going to do it all.
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8d3089a29..f9ecc564f 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -281,6 +281,14 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
$Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);
$Text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text);
+ $Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '[$1]($1)', $Text);
+ $Text = preg_replace("/\#\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '[#$2]($1)', $Text);
+ $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '[$2]($1)', $Text);
+
+
+ $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);
+ $Text = preg_replace("/\[zmg\=(.*?)\](.*?)\[\/zmg\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text);
+
// Perform MAIL Search
$Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text);
$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '[$2](mailto:$1)', $Text);