aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-20 11:16:14 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-20 11:16:14 +0200
commitafd4da8f1173480e93c3578cf2f0a58c10caa299 (patch)
treef5769136f97d2b7525e7fcbec75cdad87c88df19 /Zotlabs
parent34fec995f711b03bc19580ee9e57c22712cf51df (diff)
parent2c1560e027bc3dc6c1d611ff782b29eeabdb76f0 (diff)
downloadvolse-hubzilla-afd4da8f1173480e93c3578cf2f0a58c10caa299.tar.gz
volse-hubzilla-afd4da8f1173480e93c3578cf2f0a58c10caa299.tar.bz2
volse-hubzilla-afd4da8f1173480e93c3578cf2f0a58c10caa299.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Setup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 693f3309e..c0716ca7c 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -526,7 +526,7 @@ class Setup extends \Zotlabs\Web\Controller {
$ck_funcs[0]['status'] = false;
$ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.');
}
- if((! function_exists('imagecreatefromjpeg')) || (! class_exists('\\Imagick'))) {
+ if((! function_exists('imagecreatefromjpeg')) && (! class_exists('\\Imagick'))) {
$ck_funcs[1]['status'] = false;
$ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.');
}