| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -141,10 +141,7 @@ |
| 142 | 142 | |
| 143 | 143 | wfProfileIn( __METHOD__ ); |
| 144 | 144 | |
| 145 | | - // We want to show the content even if the page doesn't exist, as long |
| 146 | | - // as the revision does (perhaps it's been moved and the redirect |
| 147 | | - // deleted: bug 10377) |
| 148 | | - if ( 0 == $this->getID() and !$this->mOldId ) { |
| | 145 | + if ( 0 == $this->getID() ) { |
| 149 | 146 | wfProfileOut( __METHOD__ ); |
| 150 | 147 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 151 | 148 | |
| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -98,6 +98,13 @@ |
| 99 | 99 | $lang->findVariantLink( $title, $ret ); |
| 100 | 100 | |
| 101 | 101 | } |
| | 102 | + if ( $oldid = $request->getInt( 'oldid' ) ) { |
| | 103 | + // Allow oldid to override a changed or missing title. |
| | 104 | + $rev = Revision::newFromId( $oldid ); |
| | 105 | + if( $rev ) { |
| | 106 | + $ret = $rev->getTitle(); |
| | 107 | + } |
| | 108 | + } |
| 102 | 109 | return $ret ; |
| 103 | 110 | } |
| 104 | 111 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -218,7 +218,10 @@ |
| 219 | 219 | * namespaceDupes.php should work better for initial-lowercase wikis |
| 220 | 220 | * (bug 10377) "Permanent links" to revisions still work if the page is moved |
| 221 | 221 | and the redirect deleted |
| | 222 | +* (bug 7071) Properly handle an 'oldid' passed to view or edit that doesn't |
| | 223 | + match the given title. Fixes inconsistencies with talk, history, edit links. |
| 222 | 224 | |
| | 225 | + |
| 223 | 226 | == API changes since 1.10 == |
| 224 | 227 | |
| 225 | 228 | (For ongoing development discussion, see http://www.mediawiki.org/wiki/API) |