summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-09-05 02:22:53 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-09-05 02:22:53 +0000
commitb5ba248e4f2d02cefa3cd2fec88d6bc014549e64 (patch)
treec5d04191387670f42fc58ad9880aac8923cd2704
parent0fca037182251fd45582eeb4add7b9c429ad113b (diff)
downloadbrdo-b5ba248e4f2d02cefa3cd2fec88d6bc014549e64.tar.gz
brdo-b5ba248e4f2d02cefa3cd2fec88d6bc014549e64.tar.bz2
#81903 by davemicc, m3avrck, and zoeloelip. Fix status checks for MySQLi.
-rw-r--r--includes/database.mysqli.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc
index ced8c4e9e..67e49b187 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));