diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-01 15:52:35 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-01 15:52:35 -0800 |
| commit | d3183467e06d6d7a04221c63d26173f97217cc43 (patch) | |
| tree | 1da3ddc58b87a0afdfa0bf262c2d0950a192ccce /include/conversation.php | |
| parent | b62614bbd48151837e29ab56a53e683d2f4dcb01 (diff) | |
| parent | 618155e6ab1a76b5aaa667aa41a1668ce8f73a20 (diff) | |
| download | volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.gz volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.bz2 volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index c2d9641ba..b2d58a025 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -681,7 +681,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $body = prepare_body($item,true); - $is_photo = ((($item['resource_type'] == 'photo') && (feature_enabled($profile_owner,'large_photos'))) ? true : false); $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); $tmp_item = array( @@ -698,6 +697,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'thumb' => $profile_avatar, 'title' => $item['title'], 'body' => $body['html'], + 'photo' => $body['photo'], 'tags' => $body['tags'], 'categories' => $body['categories'], 'mentions' => $body['mentions'], @@ -738,7 +738,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'previewing' => $previewing, 'wait' => t('Please wait'), 'thread_level' => 1, - 'is_photo' => $is_photo, 'has_tags' => $has_tags, ); |