From b60e42d2fadd1fcbf63e283a1d2c2ab3993d730e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 28 May 2013 04:52:22 -0700
Subject: [PATCH] provide bbcode translation for imported red zmg tag (img tag
 with zot-id)

---
 boot.php           | 2 +-
 include/bbcode.php | 2 ++
 util/messages.po   | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 666e138ac..70d27ebce 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1708' );
+define ( 'FRIENDICA_VERSION',      '3.1.1714' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/include/bbcode.php b/include/bbcode.php
index 3e3345035..eaf412c35 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)
diff --git a/util/messages.po b/util/messages.po
index ccd6f7165..955353945 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1708\n"
+"Project-Id-Version: 3.1.1714\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-22 00:01-0700\n"
+"POT-Creation-Date: 2013-05-28 00:01-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6351,7 +6351,7 @@ msgid "Tips for New Members"
 msgstr ""
 
 #: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
+msgid "Friendica Communications Server - Setup"
 msgstr ""
 
 #: ../../mod/install.php:123