aboutsummaryrefslogtreecommitdiffstats
path: root/mod/message.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-04-16 20:16:44 -0700
committerfriendica <info@friendica.com>2013-04-16 20:16:44 -0700
commitf72d3512242d13fbba69b77a739319a9cd58627c (patch)
treed59c8904fda78b04ee19e42343d8c7ca56c67a5f /mod/message.php
parent3e7e0a3c43ddb742a6518a3b38b89e3d9675eae5 (diff)
parent23f897b8aedac8a99aa81ac7799ec67ca196d407 (diff)
downloadvolse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.gz
volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.bz2
volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.zip
Merge branch 'master' into photothread
Diffstat (limited to 'mod/message.php')
-rw-r--r--mod/message.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/mod/message.php b/mod/message.php
index 94a8344ea..93b5c2494 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -160,9 +160,10 @@ function item_redir_and_replace_images($body, $images, $cid) {
$newbody = '';
for($i = 0; $i < count($images); $i++) {
- $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
- $replace = '[url=' . z_path() . '/redir/' . $cid
- . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
+ $search = '/\[zrl\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/zrl\]' . '/is';
+//FIXME
+ $replace = '[zrl=' . z_path() . '/redir/' . $cid
+ . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/zrl]' ;
$img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
$process_part = substr($origbody, 0, $img_end);