- Patch #88705 by profix898 and sammys: made version checking work with PostgreSQL. (Critical bug)

1 files changed, 14 insertions, 4 deletions

diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 262a28c1c..b0ffd2692 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -18,22 +18,32 @@
 function db_status_report($phase) {
   $t = get_t();
 
-  $info = mysql_get_server_info();
+  $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() {
+  list($version) = explode('-', mysql_get_server_info());
+  return $version;
+}
+
+/**
  * Initialize a database connection.
  *
  * Note that you can change the mysql_connect() call to mysql_pconnect() if you