Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti 2018-09-20 11:16:14 +02:00
commit afd4da8f11

View File

@ -526,7 +526,7 @@ class Setup extends \Zotlabs\Web\Controller {
$ck_funcs[0]['status'] = false; $ck_funcs[0]['status'] = false;
$ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.'); $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.');
} }