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

1 files changed, 19 insertions, 14 deletions

diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index f1500c8e8..b5b53b955 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -17,26 +17,31 @@
 function db_status_report() {
   $t = get_t();
 
-  $form['pgsql'] = array();
-
-  if (function_exists('pg_version')) {
-    $version = pg_version();
-    if (version_compare($version['server'], DRUPAL_MINIMUM_PGSQL) < 0) {
-      $form['pgsql']['severity'] = REQUIREMENT_ERROR;
-      $form['pgsql']['description'] = $t('Your PostgreSQL Server is too old. Drupal requires at least PostgreSQL %version.', array('%version' => DRUPAL_MINIMUM_PGSQL));
-    }
-  }
-  else {
-    $version = array('server' => $t('Unknown'));
-  }
+  $version = db_version();
 
-  $form['pgsql']['title'] = $t('PostgreSQL database');
-  $form['pgsql']['value'] = $version['server'];
+  $form['pgsql'] = array(
+    'title' => $t('PostgreSQL database'),
+    'value' => $version,
+  );
+
+  if (version_compare($version, DRUPAL_MINIMUM_PGSQL) < 0) {
+    $form['pgsql']['severity'] = REQUIREMENT_ERROR;
+    $form['pgsql']['description'] = $t('Your PostgreSQL Server is too old. Drupal requires at least PostgreSQL %version.', array('%version' => DRUPAL_MINIMUM_PGSQL));
+  }
 
   return $form;
 }
 
 /**
+ * Returns the version of the database server currently in use.
+ *
+ * @return Database server version
+ */
+function db_version() {
+  return db_result(db_query("SHOW SERVER_VERSION"));
+}
+
+/**
  * Initialize a database connection.
  *
  * Note that you can change the pg_connect() call to pg_pconnect() if you