aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-27 16:01:44 -0800
committerfriendica <info@friendica.com>2014-02-27 16:01:44 -0800
commit402d44e2f4a7db97236d1999076ef57b69cec4b9 (patch)
treed9b2cb4be8c35932db7d7b77eaac8cf6940cc4f0
parent5cf0e74501f4e72b29f8f486e8d6aac769d0ed24 (diff)
downloadvolse-hubzilla-402d44e2f4a7db97236d1999076ef57b69cec4b9.tar.gz
volse-hubzilla-402d44e2f4a7db97236d1999076ef57b69cec4b9.tar.bz2
volse-hubzilla-402d44e2f4a7db97236d1999076ef57b69cec4b9.zip
fix photos in private mail
-rw-r--r--include/message.php2
-rw-r--r--version.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/message.php b/include/message.php
index a95021583..607166ec9 100644
--- a/include/message.php
+++ b/include/message.php
@@ -76,7 +76,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$match = null;
$images = null;
- if(preg_match_all("/\[img\](.*?)\[\/img\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
+ if(preg_match_all("/\[zmg\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
$images = $match[1];
$match = false;
diff --git a/version.inc b/version.inc
index ecdc97e53..cc429ef06 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-26.600
+2014-02-27.601