diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-29 10:04:34 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-29 10:04:34 +0100 |
| commit | 7c2efa697cdcbda05affe43cc00274ddbea9b21b (patch) | |
| tree | 65c52699af4786f85618ee4e2d7fa52d6d71aa13 | |
| parent | e1df69dfcb09d28635db995a147329453be6c4bf (diff) | |
| download | volse-hubzilla-7c2efa697cdcbda05affe43cc00274ddbea9b21b.tar.gz volse-hubzilla-7c2efa697cdcbda05affe43cc00274ddbea9b21b.tar.bz2 volse-hubzilla-7c2efa697cdcbda05affe43cc00274ddbea9b21b.zip | |
merge Zotlabs/Module/Photo.php from dev
| -rw-r--r-- | Zotlabs/Module/Photo.php | 12 |
1 files changed, 0 insertions, 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 |