aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Photo
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-08-13 09:46:01 +0200
committerMario Vavti <mario@mariovavti.com>2019-08-13 09:46:01 +0200
commite8f3b7f8530c69045dcabffecab2f158d0b35214 (patch)
treee02872bbb9a7226f30f78a1784fae113431eceaa /Zotlabs/Photo
parent892e9cd835612c8155bf3c15436137f94abbb667 (diff)
parente28341ca4beb1b746a5c17590f62c02cc8df49ba (diff)
downloadvolse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.gz
volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.bz2
volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.zip
Merge branch '4.4RC'4.4
Diffstat (limited to 'Zotlabs/Photo')
-rw-r--r--Zotlabs/Photo/PhotoDriver.php10
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;