* (bug 16937) Show appropriate error message when someone attempts an install on...

* Fix some issues with the earlier migration of getServerVersion() to numeric only.

diff --git a/config/index.php b/config/index.php
index f8b5966..0a2d290 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -894,7 +894,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        continue;
                }
 
-               print "<li>Connected to $myver";
+               print "<li>Connected to {$conf->DBtype} $myver";
                if ($conf->DBtype == 'mysql') {
                        if( version_compare( $myver, "4.0.14" ) < 0 ) {
                                print "</li>\n";
@@ -945,7 +945,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        $wgDatabase->selectDB( $wgDBname );
                }
                else if ($conf->DBtype == 'postgres') {
-                       if( version_compare( $myver, "PostgreSQL 8.0" ) < 0 ) {
+                       if( version_compare( $myver, "8.0" ) < 0 ) {
                                dieout( "<b>Postgres 8.0 or later is required</b>. Aborting." );
                        }
                }

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 00eddf5..91fd516 100644 (file)
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1056,7 +1056,13 @@ class DatabasePostgres extends Database {
         */
        function getServerVersion() {
                $versionInfo = pg_version( $this->mConn );
-               $this->numeric_version = $versionInfo['server'];
+               if ( isset( $versionInfo['server'] ) ) {
+                       $this->numeric_version = $versionInfo['server'];
+               } else {
+                       // There's no way to identify the precise version before 7.4, but 
+                       // it doesn't matter anyway since we're just going to give an error.
+                       $this->numeric_version = '7.3 or earlier';
+               }
                return $this->numeric_version;
        }