diff options
Diffstat (limited to 'includes/database.mysqli.inc')
| -rw-r--r-- | includes/database.mysqli.inc | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index dd647165e..7cc5943b7 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -19,26 +19,35 @@ * Report database status. */ function db_status_report($phase) { - global $active_db; - $t = get_t(); - $info = mysqli_get_server_info($active_db); + $version = db_version(); + $form['mysql'] = array( 'title' => $t('MySQL database'), - 'value' => ($phase == 'runtime') ? l($info, 'admin/logs/status/sql') : $info, + 'value' => ($phase == 'runtime') ? l($version, 'admin/logs/status/sql') : $version, ); - // Extract version number - 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)); } + return $form; } /** + * Returns the version of the database server currently in use. + * + * @return Database server version + */ +function db_version() { + global $active_db; + list($version) = explode('-', mysqli_get_server_info($active_db)); + return $version; +} + +/** * Initialise a database connection. * * Note that mysqli does not support persistent connections. |