| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -103,12 +103,8 @@ |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | function archive( $name ) { |
| 107 | | - global $wgDBtype, $IP; |
| 108 | | - if ( file_exists( "$IP/maintenance/$wgDBtype/archives/$name" ) ) { |
| 109 | | - return "$IP/maintenance/$wgDBtype/archives/$name"; |
| 110 | | - } else { |
| 111 | | - return "$IP/maintenance/archives/$name"; |
| 112 | | - } |
| | 107 | + wfDeprecated( __FUNCTION__ ); |
| | 108 | + return DatabaseBase::patchPath( $name ); |
| 113 | 109 | } |
| 114 | 110 | |
| 115 | 111 | function do_interwiki_update() { |
| Index: trunk/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | if ( $isFullPath ) { |
| 167 | 167 | $this->db->sourceFile( $path ); |
| 168 | 168 | } else { |
| 169 | | - $this->db->sourceFile( archive( $path ) ); |
| | 169 | + $this->db->sourceFile( DatabaseBase::patchPath( $path ) ); |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
| Index: trunk/phase3/includes/installer/PostgresUpdater.php |
| — | — | @@ -564,7 +564,7 @@ |
| 565 | 565 | wfOut( "Dropping rule \"archive_delete\"\n" ); |
| 566 | 566 | $this->db->query( 'DROP RULE archive_delete ON archive' ); |
| 567 | 567 | } |
| 568 | | - $this->db->sourceFile( archive( 'patch-remove-archive2.sql' ) ); |
| | 568 | + $this->applyPatch( 'patch-remove-archive2.sql' ); |
| 569 | 569 | } else { |
| 570 | 570 | wfOut( "... obsolete table \"archive2\" does not exist\n" ); |
| 571 | 571 | } |