aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-10-14 22:24:13 +0200
committerMario Vavti <mario@mariovavti.com>2015-10-14 22:24:13 +0200
commitf12ebffa39b0bfa320e665a741ec57e48717e33a (patch)
tree96642bd6ca264600870884ac4c438943ab4e600b
parentb4e83b65375e62259671749c089d9cd7a2a2967a (diff)
downloadvolse-hubzilla-f12ebffa39b0bfa320e665a741ec57e48717e33a.tar.gz
volse-hubzilla-f12ebffa39b0bfa320e665a741ec57e48717e33a.tar.bz2
volse-hubzilla-f12ebffa39b0bfa320e665a741ec57e48717e33a.zip
really check for large photos feature
-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(