| Index: branches/REL1_14/phase3/HISTORY |
| — | — | @@ -1,5 +1,7 @@ |
| 2 | 2 | Change notes from older releases. For current info see RELEASE-NOTES. |
| 3 | 3 | |
| | 4 | +== MediaWiki 1.13 == |
| | 5 | + |
| 4 | 6 | == Changes since 1.13.2 == |
| 5 | 7 | |
| 6 | 8 | David Remahl of Apple's Product Security team has identified a number of |
| Index: branches/REL1_14/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: branches/REL1_14/phase3/includes/db/Database.php |
| — | — | @@ -922,7 +922,7 @@ |
| 923 | 923 | $row = $this->fetchRow( $res ); |
| 924 | 924 | if ( $row !== false ) { |
| 925 | 925 | $this->freeResult( $res ); |
| 926 | | - return $row[0]; |
| | 926 | + return reset( $row ); |
| 927 | 927 | } else { |
| 928 | 928 | return false; |
| 929 | 929 | } |
| Index: branches/REL1_14/phase3/includes/db/DatabaseSqlite.php |
| — | — | @@ -410,6 +410,14 @@ |
| 411 | 411 | return "SearchEngineDummy"; |
| 412 | 412 | } |
| 413 | 413 | |
| | 414 | + /** |
| | 415 | + * No-op version of deadlockLoop |
| | 416 | + */ |
| | 417 | + public function deadlockLoop( /*...*/ ) { |
| | 418 | + $args = func_get_args(); |
| | 419 | + $function = array_shift( $args ); |
| | 420 | + return call_user_func_array( $function, $args ); |
| | 421 | + } |
| 414 | 422 | } |
| 415 | 423 | |
| 416 | 424 | /** |
| Index: branches/REL1_14/phase3/includes/DefaultSettings.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** MediaWiki version number */ |
| 37 | | -$wgVersion = '1.14rc1'; |
| | 37 | +$wgVersion = '1.14.0rc1'; |
| 38 | 38 | |
| 39 | 39 | /** Name of the site. It must be changed in LocalSettings.php */ |
| 40 | 40 | $wgSitename = 'MediaWiki'; |
| Index: branches/REL1_14/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 | } |
| Index: branches/REL1_14/phase3/RELEASE-NOTES |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | |
| 7 | 7 | == MediaWiki 1.14 == |
| 8 | 8 | |
| 9 | | -This is a release candidate for the 2008 Q1 branch of MediaWiki. |
| | 9 | +This is a release candidate for the 2009 Q1 branch of MediaWiki. |
| 10 | 10 | |
| 11 | 11 | MediaWiki is now using a "continuous integration" development model with |
| 12 | 12 | quarterly snapshot releases. The latest development code is always kept |
| Property changes on: branches/REL1_14/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 13 | 13 | + /trunk/phase3:45592 |