diff options
author | zotlabs <mike@macgirvin.com> | 2019-06-26 21:54:50 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-06-26 21:54:50 -0700 |
commit | d83ce0863abaf448b64c550999e070376fd71b71 (patch) | |
tree | a0f0b45249487bd471bcf0545dfbb23f7b871623 /Zotlabs/Photo | |
parent | cf844cb27c02c3aae636eb1aa1587b1d5e3e81a0 (diff) | |
parent | 5ccef18d4e5b7901f78a11e0124c16e1c484e3bf (diff) | |
download | volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.gz volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.bz2 volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Photo')
-rw-r--r-- | Zotlabs/Photo/PhotoDriver.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php index 146ef0ae4..94d2c3436 100644 --- a/Zotlabs/Photo/PhotoDriver.php +++ b/Zotlabs/Photo/PhotoDriver.php @@ -502,13 +502,17 @@ abstract class PhotoDriver { * * @param array $arr * @param scale int - * @return boolean|array + * @return boolean */ public function storeThumbnail($arr, $scale = 0) { - + + // We only process thumbnails here + if($scale == 0) + return false; + $arr['imgscale'] = $scale; - if(boolval(get_config('system','filesystem_storage_thumbnails', 0)) && $scale > 0) { + if(boolval(get_config('system','filesystem_storage_thumbnails', 0))) { $channel = channelx_by_n($arr['uid']); $arr['os_storage'] = 1; $arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale; |