Merge branch 'patch-1' into 'dev'
Disable image caching if personal or group permissions enabled See merge request hubzilla/core!1377
This commit is contained in:
commit
61deb4fcfd
@ -128,10 +128,8 @@ class Photo extends \Zotlabs\Web\Controller {
|
|||||||
$photo = substr($photo,0,-2);
|
$photo = substr($photo,0,-2);
|
||||||
// If viewing on a high-res screen, attempt to serve a higher resolution image:
|
// If viewing on a high-res screen, attempt to serve a higher resolution image:
|
||||||
if ($resolution == 2 && ($cookie_value > 1))
|
if ($resolution == 2 && ($cookie_value > 1))
|
||||||
{
|
|
||||||
$resolution = 1;
|
$resolution = 1;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
|
$r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
|
||||||
dbesc($photo),
|
dbesc($photo),
|
||||||
@ -171,6 +169,8 @@ class Photo extends \Zotlabs\Web\Controller {
|
|||||||
$modified = strtotime($e[0]['edited']);
|
$modified = strtotime($e[0]['edited']);
|
||||||
if(intval($e[0]['os_storage']))
|
if(intval($e[0]['os_storage']))
|
||||||
$streaming = $data;
|
$streaming = $data;
|
||||||
|
if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '')
|
||||||
|
$prvcachecontrol = true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(! $allowed) {
|
if(! $allowed) {
|
||||||
|
Reference in New Issue
Block a user