Commit b5ba248e authored by drumm's avatar drumm

#81903 by davemicc, m3avrck, and zoeloelip. Fix status checks for MySQLi.

parent 0fca0371
...@@ -19,16 +19,18 @@ ...@@ -19,16 +19,18 @@
* Report database status. * Report database status.
*/ */
function db_status_report() { function db_status_report() {
global $active_db;
$t = get_t(); $t = get_t();
$info = mysqli_get_server_info($connection); $info = mysqli_get_server_info($active_db);
$form['mysql'] = array( $form['mysql'] = array(
'title' => $t('MySQL database'), 'title' => $t('MySQL database'),
'value' => ($phase == 'runtime') ? l($info, 'admin/logs/status/sql') : $info, 'value' => ($phase == 'runtime') ? l($info, 'admin/logs/status/sql') : $info,
); );
// Extract version number // Extract version number
list($version) = explode('-', mysqli_get_server_info($connection)); list($version) = explode('-', $info);
if (version_compare($version, DRUPAL_MINIMUM_MYSQL) < 0) { if (version_compare($version, DRUPAL_MINIMUM_MYSQL) < 0) {
$form['mysql']['severity'] = REQUIREMENT_ERROR; $form['mysql']['severity'] = REQUIREMENT_ERROR;
$form['mysql']['description'] = $t('Your MySQL Server is too old. Drupal requires at least MySQL %version.', array('%version' => DRUPAL_MINIMUM_MYSQL)); $form['mysql']['description'] = $t('Your MySQL Server is too old. Drupal requires at least MySQL %version.', array('%version' => DRUPAL_MINIMUM_MYSQL));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment