diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
| commit | b89d2d7580e40cd417defaffd2514b5eed38577d (patch) | |
| tree | 78ba9004d87b994dd9a531b475fd51b940bf3dd8 /Zotlabs/Photo/PhotoDriver.php | |
| parent | 350e636e3d0a44323c69185555e89cc01a213aa2 (diff) | |
| parent | 047dd31724f8da12c153b4a6f27dc5462f7b97e5 (diff) | |
| download | volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.gz volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.bz2 volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Photo/PhotoDriver.php')
| -rw-r--r-- | Zotlabs/Photo/PhotoDriver.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php index bacf926ff..94d2c3436 100644 --- a/Zotlabs/Photo/PhotoDriver.php +++ b/Zotlabs/Photo/PhotoDriver.php @@ -502,14 +502,18 @@ 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) { - $channel = \App::get_channel(); + 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; if(! $this->saveImage($arr['os_syspath'])) |