aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-07 17:25:38 -0700
committerMario Vavti <mario@mariovavti.com>2017-05-08 11:11:50 +0200
commita7ea370ec3c18b102a6a6a70b770adc16fdb0aa2 (patch)
treeb60b294a2909c694a07199fd0760b21f2f03a252 /Zotlabs/Module
parentbd3708870d04bd59d3a632945d1f4ff63640afe8 (diff)
downloadvolse-hubzilla-a7ea370ec3c18b102a6a6a70b770adc16fdb0aa2.tar.gz
volse-hubzilla-a7ea370ec3c18b102a6a6a70b770adc16fdb0aa2.tar.bz2
volse-hubzilla-a7ea370ec3c18b102a6a6a70b770adc16fdb0aa2.zip
cover photo was unintentionally disabled when block_public in effect
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Photo.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 256a51e71..dc4ae670e 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -127,7 +127,6 @@ class Photo extends \Zotlabs\Web\Controller {
}
}
-
$r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
dbesc($photo),
intval($resolution)
@@ -150,12 +149,14 @@ class Photo extends \Zotlabs\Web\Controller {
$channel = channelx_by_n($r[0]['uid']);
// Now we'll see if we can access the photo
-
$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
dbesc($photo),
intval($resolution)
);
-
+
+ if($r && $r[0]['photo_usage'] == PHOTO_COVER)
+ $allowed = 1;
+
$d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r, 'allowed' => $allowed ];
call_hooks('get_photo',$d);