| Index: trunk/phase3/includes/db/DatabasePostgres.php |
| — | — | @@ -1056,7 +1056,13 @@ |
| 1057 | 1057 | */ |
| 1058 | 1058 | function getServerVersion() { |
| 1059 | 1059 | $versionInfo = pg_version( $this->mConn ); |
| 1060 | | - $this->numeric_version = $versionInfo['server']; |
| | 1060 | + if ( isset( $versionInfo['server'] ) ) { |
| | 1061 | + $this->numeric_version = $versionInfo['server']; |
| | 1062 | + } else { |
| | 1063 | + // There's no way to identify the precise version before 7.4, but |
| | 1064 | + // it doesn't matter anyway since we're just going to give an error. |
| | 1065 | + $this->numeric_version = '7.3 or earlier'; |
| | 1066 | + } |
| 1061 | 1067 | return $this->numeric_version; |
| 1062 | 1068 | } |
| 1063 | 1069 | |
| Index: trunk/phase3/config/index.php |
| — | — | @@ -894,7 +894,7 @@ |
| 895 | 895 | continue; |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | | - print "<li>Connected to $myver"; |
| | 898 | + print "<li>Connected to {$conf->DBtype} $myver"; |
| 899 | 899 | if ($conf->DBtype == 'mysql') { |
| 900 | 900 | if( version_compare( $myver, "4.0.14" ) < 0 ) { |
| 901 | 901 | print "</li>\n"; |
| — | — | @@ -945,7 +945,7 @@ |
| 946 | 946 | $wgDatabase->selectDB( $wgDBname ); |
| 947 | 947 | } |
| 948 | 948 | else if ($conf->DBtype == 'postgres') { |
| 949 | | - if( version_compare( $myver, "PostgreSQL 8.0" ) < 0 ) { |
| | 949 | + if( version_compare( $myver, "8.0" ) < 0 ) { |
| 950 | 950 | dieout( "<b>Postgres 8.0 or later is required</b>. Aborting." ); |
| 951 | 951 | } |
| 952 | 952 | } |