aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ItemObject.php2
-rw-r--r--include/conversation.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 46bb78ecd..ee431dccb 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -278,7 +278,7 @@ class Item extends BaseObject {
$children = $this->get_children();
- $is_photo = (($item['resource_type'] == 'photo') ? true : false) && feature_enabled($conv->get_profile_owner(),'large_photos');
+ $is_photo = ((($item['resource_type'] == 'photo') && (feature_enabled($conv->get_profile_owner(),'large_photos'))) ? true : false);
$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
diff --git a/include/conversation.php b/include/conversation.php
index 0d357e2eb..f1a7225b8 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -681,7 +681,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$body = prepare_body($item,true);
- $is_photo = (($item['resource_type'] == 'photo') ? true : false);
+ $is_photo = ((($item['resource_type'] == 'photo') && (feature_enabled($conv->get_profile_owner(),'large_photos'))) ? true : false);
$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
$tmp_item = array(