| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1196,6 +1196,8 @@ |
| 1197 | 1197 | # Enabled article-related sidebar, toplinks, etc. |
| 1198 | 1198 | $wgOut->setArticleRelated( true ); |
| 1199 | 1199 | |
| | 1200 | + $cancelParams = array(); |
| | 1201 | + |
| 1200 | 1202 | if ( $this->isConflict ) { |
| 1201 | 1203 | $wgOut->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1</div>", 'explainconflict' ); |
| 1202 | 1204 | |
| — | — | @@ -1246,6 +1248,7 @@ |
| 1247 | 1249 | |
| 1248 | 1250 | if ( !$this->mArticle->mRevision->isCurrent() ) { |
| 1249 | 1251 | $this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() ); |
| | 1252 | + $cancelParams['oldid'] = $this->mArticle->mRevision->getId(); |
| 1250 | 1253 | $wgOut->addWikiMsg( 'editingold' ); |
| 1251 | 1254 | } |
| 1252 | 1255 | } |
| — | — | @@ -1325,7 +1328,7 @@ |
| 1326 | 1329 | $wgTitle, |
| 1327 | 1330 | wfMsgExt( 'cancel', array( 'parseinline' ) ), |
| 1328 | 1331 | array( 'id' => 'mw-editform-cancel' ), |
| 1329 | | - array(), |
| | 1332 | + $cancelParams, |
| 1330 | 1333 | array( 'known', 'noclasses' ) |
| 1331 | 1334 | ); |
| 1332 | 1335 | $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -502,6 +502,8 @@ |
| 503 | 503 | * (bug 18180) Special:Export ignores limit, dir, offset parameters |
| 504 | 504 | * User::getBlockedStatus() works for all kinds of user objects and doesn't |
| 505 | 505 | assume the user object is equal to the current-user object ($wgUser) |
| | 506 | +* (bug 20517) Cancel link from edit page now returns to the old version when |
| | 507 | + editing an old version |
| 506 | 508 | |
| 507 | 509 | == API changes in 1.16 == |
| 508 | 510 | |