| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -575,12 +575,13 @@ |
| 576 | 576 | $keys = array(); |
| 577 | 577 | |
| 578 | 578 | if ( $this->oldid ) { |
| 579 | | - if ( $wgEnotifImpersonal ) { |
| 580 | | - // For impersonal mail, show a diff link to the last revision. |
| 581 | | - $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', |
| 582 | | - $this->title->getCanonicalUrl( 'diff=next&oldid=' . $this->oldid ) ); |
| 583 | | - } else { |
| 584 | | - $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', |
| | 579 | + // Always show a link to the diff which triggered the mail. See bug 32210. |
| | 580 | + $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', |
| | 581 | + $this->title->getCanonicalUrl( 'diff=next&oldid=' . $this->oldid ) ); |
| | 582 | + if ( !$wgEnotifImpersonal ) { |
| | 583 | + // For personal mail, also show a link to the diff of all changes |
| | 584 | + // since last visited. |
| | 585 | + $keys['$NEWPAGE'] .= " \n" . wfMsgForContent( 'enotif_lastvisited', |
| 585 | 586 | $this->title->getCanonicalUrl( 'diff=0&oldid=' . $this->oldid ) ); |
| 586 | 587 | } |
| 587 | 588 | $keys['$OLDID'] = $this->oldid; |
| Index: trunk/phase3/RELEASE-NOTES-1.20 |
| — | — | @@ -22,6 +22,8 @@ |
| 23 | 23 | when we try to set the user's cookies for login. |
| 24 | 24 | * (bug 34254) Using a gzipped file cache ($wgUseGzip and $wgUseFileCache) |
| 25 | 25 | compressed the output twice resulting in garbage output (since 1.18) |
| | 26 | +* (bug 32210) New edit emails for watched pages always provide a link to the |
| | 27 | + edit which triggered the mail. |
| 26 | 28 | |
| 27 | 29 | === API changes in 1.20 === |
| 28 | 30 | * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API. |