From b5ba248e4f2d02cefa3cd2fec88d6bc014549e64 Mon Sep 17 00:00:00 2001 From: Neil Drumm Date: Tue, 5 Sep 2006 02:22:53 +0000 Subject: [PATCH] #81903 by davemicc, m3avrck, and zoeloelip. Fix status checks for MySQLi. --- includes/database.mysqli.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index ced8c4e9e8dc70a..67e49b18765260b 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -19,16 +19,18 @@ * Report database status. */ function db_status_report() { + global $active_db; + $t = get_t(); - $info = mysqli_get_server_info($connection); + $info = mysqli_get_server_info($active_db); $form['mysql'] = array( 'title' => $t('MySQL database'), 'value' => ($phase == 'runtime') ? l($info, 'admin/logs/status/sql') : $info, ); // Extract version number - list($version) = explode('-', mysqli_get_server_info($connection)); + list($version) = explode('-', $info); if (version_compare($version, DRUPAL_MINIMUM_MYSQL) < 0) { $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));