From ef25e72486a914664fa989832f349e75af9b3d3e Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 7 Nov 2016 14:43:37 +0100 Subject: [PATCH] fixes #515 adds check on mysql extension loaded Especially on PHP 7 where only mysqli can be available. --- install.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/install.php b/install.php index 475cf70f0..b6d535c68 100644 --- a/install.php +++ b/install.php @@ -133,7 +133,26 @@ $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost'; $dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : ''; $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : ''; $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : ''; -$dblayer = extension_loaded('mysqli') ? 'mysqli' : 'mysql'; + +// dblayer +if (extension_loaded('mysqli')) +{ + $dblayer = 'mysqli'; +} +else +{ + if (version_compare(PHP_VERSION, '7') >= 0) + { + fatal_error('PHP extension "mysqli" is not loaded'); + } + + if (!extension_loaded('mysql')) + { + fatal_error('No PHP extension installed for mysql, Piwigo needs one'); + } + + $dblayer = 'mysql'; +} $admin_name = (!empty($_POST['admin_name'])) ? $_POST['admin_name'] : ''; $admin_pass1 = (!empty($_POST['admin_pass1'])) ? $_POST['admin_pass1'] : '';