From 7c2efa697cdcbda05affe43cc00274ddbea9b21b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 29 Oct 2018 10:04:34 +0100 Subject: [PATCH] merge Zotlabs/Module/Photo.php from dev --- Zotlabs/Module/Photo.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 3f68e5c67..8efc00707 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -151,18 +151,6 @@ class Photo extends \Zotlabs\Web\Controller { $allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo); } - if(intval($r[0]['photo_usage'])) { - $allowed = 1; - if(intval($r[0]['photo_usage']) === PHOTO_COVER) - if($resolution < PHOTO_RES_COVER_1200) - $allowed = (-1); - if(intval($r[0]['photo_usage']) === PHOTO_PROFILE) - if(! in_array($resolution,[4,5,6])) - $allowed = (-1); - } - if($allowed === (-1)) - $allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo); - $channel = channelx_by_n($r[0]['uid']); // Now we'll see if we can access the photo