Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap

This commit is contained in:
zotlabs 2018-09-17 13:00:02 -07:00
commit 926c63ee84

View file

@ -531,7 +531,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.');
} }
@ -539,14 +539,14 @@ class Setup extends \Zotlabs\Web\Controller {
$ck_funcs[2]['status'] = false; $ck_funcs[2]['status'] = false;
$ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.'); $ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.');
} }
if(class_exists('PDO')) { if(class_exists('\\PDO')) {
$x = PDO::getAvailableDrivers(); $x = \PDO::getAvailableDrivers();
if((! in_array('mysql',$x)) && (! in_array('pgsql',$x))) { if((! in_array('mysql',$x)) && (! in_array('pgsql',$x))) {
$ck_funcs[3]['status'] = false; $ck_funcs[3]['status'] = false;
$ck_funcs[3]['help'] = t('Error: PDO database PHP module missing a driver for either mysql or pgsql.'); $ck_funcs[3]['help'] = t('Error: PDO database PHP module missing a driver for either mysql or pgsql.');
} }
} }
if(! class_exists('PDO')) { if(! class_exists('\\PDO')) {
$ck_funcs[3]['status'] = false; $ck_funcs[3]['status'] = false;
$ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.'); $ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.');
} }