| Index: branches/REL1_15/phase3/includes/db/DatabasePostgres.php |
| — | — | @@ -1076,12 +1076,15 @@ |
| 1077 | 1077 | */ |
| 1078 | 1078 | function getServerVersion() { |
| 1079 | 1079 | $versionInfo = pg_version( $this->mConn ); |
| 1080 | | - if ( isset( $versionInfo['server'] ) ) { |
| | 1080 | + if ( version_compare( $versionInfo['client'], '7.4.0', 'lt' ) ) { |
| | 1081 | + // Old client, abort install |
| | 1082 | + $this->numeric_version = '7.3 or earlier'; |
| | 1083 | + } elseif ( isset( $versionInfo['server'] ) ) { |
| | 1084 | + // Normal client |
| 1081 | 1085 | $this->numeric_version = $versionInfo['server']; |
| 1082 | 1086 | } else { |
| 1083 | | - // There's no way to identify the precise version before 7.4, but |
| 1084 | | - // it doesn't matter anyway since we're just going to give an error. |
| 1085 | | - $this->numeric_version = '7.3 or earlier'; |
| | 1087 | + // Bug 16937: broken pgsql extension from PHP<5.3 |
| | 1088 | + $this->numeric_version = pg_parameter_status( $this->mConn, 'server_version' ); |
| 1086 | 1089 | } |
| 1087 | 1090 | return $this->numeric_version; |
| 1088 | 1091 | } |
| Property changes on: branches/REL1_15/phase3/includes/db |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1089 | 1092 | + /trunk/phase3/includes/db:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50473 |
| /trunk/phase3/includes/specials/db:48993 |
| Index: branches/REL1_15/phase3/RELEASE-NOTES |
| — | — | @@ -282,12 +282,21 @@ |
| 283 | 283 | IS NULL |
| 284 | 284 | * (bug 18018) Deleting a file redirect leaves behind a malfunctioning redirect |
| 285 | 285 | * (bug 17537) Disable bad zlib.output_compression output on HTTP 304 responses |
| 286 | | -* (bug 11213) [edit] section links in printable version no longer appear when you cut-and-paste article text |
| | 286 | +* (bug 11213) [edit] section links in printable version no longer appear when |
| | 287 | + you cut-and-paste article text |
| 287 | 288 | * (bug 17405) "Did you mean" to mirror Go/Search behavior of original request |
| 288 | 289 | * (bug 18116) 'edittools' is now output identically on edit and upload pages |
| 289 | | -* (bug 17241) The diffonly URI parameter should cascade to "Next edit" and "Previous edit" diff links |
| | 290 | +* (bug 17241) The diffonly URI parameter should cascade to "Next edit" and |
| | 291 | + "Previous edit" diff links |
| 290 | 292 | * (bug 16823) 'Sidebar search form should not use Special:Search view URL as target' |
| 291 | 293 | * (bug 16343) Non-existing, but in use, category pages can be "go" match hits |
| | 294 | +* Fixed the circular template inclusion check, was broken when the loop |
| | 295 | + involved redirects. Without this, infinite recursion within the parser is |
| | 296 | + possible. |
| | 297 | +* (bug 17611) Provide a sensible error message on install when the SQLite data |
| | 298 | + directory is wrong. |
| | 299 | +* (bug 16937) Fixed PostgreSQL installation on Windows, workaround for upstream |
| | 300 | + pg_version() bug. |
| 292 | 301 | |
| 293 | 302 | == API changes in 1.15 == |
| 294 | 303 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |
| — | — | @@ -337,14 +346,9 @@ |
| 338 | 347 | a POST request |
| 339 | 348 | * (bug 18099) Using appendtext to edit a non-existent page causes an interface |
| 340 | 349 | message to be included in the page text |
| 341 | | -* Fixed the circular template inclusion check, was broken when the loop |
| 342 | | - involved redirects. Without this, infinite recursion within the parser is |
| 343 | | - possible. |
| 344 | 350 | * (bug 18601) generator=backlinks returns invalid continue parameter |
| 345 | 351 | * (bug 18597) Internal error with empty generator= parameter |
| 346 | 352 | * (bug 18617) Add xml:space="preserve" attribute to relevant tags in XML output |
| 347 | | -* (bug 17611) Provide a sensible error message on install when the SQLite data |
| 348 | | - directory is wrong. |
| 349 | 353 | |
| 350 | 354 | === Languages updated in 1.15 === |
| 351 | 355 | |