X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=eaf412c35394bfae5e09ba4de1e603b6fc1d426e;hb=c82e5fde0a6ff153a4f72f2c51c3e144093ef31b;hp=5b676bbadbf16adc628d37aaad9c7b7ee5789ee4;hpb=5ef6bdf88a7fc3e816ccc3c0894c8adcf86697df;p=friendica.git

diff --git a/include/bbcode.php b/include/bbcode.php
index 5b676bbadb..eaf412c353 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -543,10 +543,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	// [img=widthxheight]image source[/img]
 	//$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $Text);
+	$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$3" style="width: $1px;" >', $Text);
 
 	// Images
 	// [img]pathtoimage[/img]
 	$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
+	$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
 
 	// Shared content
 	if (!$simplehtml)
@@ -673,7 +675,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	//}
 
 	// Remove all hashtag addresses
-	if (!$tryoembed) {
+	if (!$tryoembed AND get_config("system", "remove_hashtags_on_export")) {
 		$pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
 		$Text = preg_replace($pattern, '#$2', $Text);
 	}
@@ -684,4 +686,3 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
 	return $Text;
 }
-