diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-30 18:46:16 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-30 18:46:16 +0100 |
| commit | f8b767ed32391763a3abb7bbc38422d7b8cb5991 (patch) | |
| tree | 5826a90faf225420199990abbe42744c07b90737 /include | |
| parent | d0b0d0ec727fea06cc1c129c53ef8965c9c0a7b4 (diff) | |
| download | volse-hubzilla-f8b767ed32391763a3abb7bbc38422d7b8cb5991.tar.gz volse-hubzilla-f8b767ed32391763a3abb7bbc38422d7b8cb5991.tar.bz2 volse-hubzilla-f8b767ed32391763a3abb7bbc38422d7b8cb5991.zip | |
fix photo item for search_item.tpl and a minor css fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | include/photo/photo_gd.php | 2 |
2 files changed, 2 insertions, 3 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, ); diff --git a/include/photo/photo_gd.php b/include/photo/photo_gd.php index fa1f700e9..2ac7287e4 100644 --- a/include/photo/photo_gd.php +++ b/include/photo/photo_gd.php @@ -137,4 +137,4 @@ class photo_gd extends photo_driver { return $string; } -}
\ No newline at end of file +} |