diff options
| author | Hauke Zuehl <hzuehl@phone-talk.de> | 2012-06-16 18:04:59 +0200 |
|---|---|---|
| committer | Hauke Zuehl <hzuehl@phone-talk.de> | 2012-06-16 18:04:59 +0200 |
| commit | f9a40ccbdea69fc7ffcbdc87356d535c67371210 (patch) | |
| tree | 18eca4019eb8e64badb7035ab782b729b706cd64 /include/conversation.php | |
| parent | 1231dd72f02fdec59b78ed9a6408887c2ae0b8d4 (diff) | |
| parent | 4faf0e609fe03095069c7a4bcdfc3496e4a28627 (diff) | |
| download | volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.gz volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.bz2 volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index a9c6287a9..1d5a92284 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -173,8 +173,8 @@ function localize_item(&$item){ $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); } } + // add zrl's to public images if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) { -logger('matched'); foreach($matches as $mtch) { $item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']); } @@ -546,7 +546,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } $likebuttons = ''; - $shareable = ((($profile_owner == local_user()) && (! $item['private'])) ? true : false); //($mode != 'display') && + $shareable = ((($profile_owner == local_user()) && ((! $item['private']) || $item['network'] === NETWORK_FEED)) ? true : false); if($page_writeable) { if($toplevelpost) { |