| Index: branches/REL1_16/phase3/includes/UserMailer.php |
| — | — | @@ -472,6 +472,7 @@ |
| 473 | 473 | |
| 474 | 474 | $keys['$PAGEMINOREDIT'] = $medit; |
| 475 | 475 | $keys['$PAGESUMMARY'] = $summary; |
| | 476 | + $keys['$UNWATCHURL'] = $this->title->getFullUrl( 'action=unwatch' ); |
| 476 | 477 | |
| 477 | 478 | $subject = strtr( $subject, $keys ); |
| 478 | 479 | |
| Property changes on: branches/REL1_16/phase3/includes/UserMailer.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 479 | 480 | + /branches/REL1_15/phase3/includes/UserMailer.php:51646 |
| /branches/sqlite/includes/UserMailer.php:58211-58321 |
| /branches/wmf-deployment/includes/UserMailer.php:53381 |
| /trunk/phase3/includes/UserMailer.php:63549,63764,63897-63901,64876,64881,64948,65027 |
| Index: branches/REL1_16/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2644,7 +2644,7 @@ |
| 2645 | 2645 | {{fullurl:{{#special:Watchlist}}/edit}} |
| 2646 | 2646 | |
| 2647 | 2647 | To delete the page from your watchlist, visit |
| 2648 | | -{{fullurl:{{FULLPAGENAMEE}}|action=unwatch}} |
| | 2648 | +$UNWATCHURL |
| 2649 | 2649 | |
| 2650 | 2650 | Feedback and further assistance: |
| 2651 | 2651 | {{fullurl:{{MediaWiki:Helppage}}}}', |
| Property changes on: branches/REL1_16/phase3/languages/messages/MessagesEn.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 2652 | 2652 | + /trunk/phase3/languages/messages/MessagesEn.php:63545-63546,63549,63643,63764,63897-63901,64876,65027 |
| Index: branches/REL1_16/phase3/RELEASE-NOTES |
| — | — | @@ -66,6 +66,8 @@ |
| 67 | 67 | * (bug 23171) Improve IE6 version check to avoid false positives. |
| 68 | 68 | * (bug 23176) Fixed upload warning override feature "upload new version", |
| 69 | 69 | broken in 1.16 beta 1. |
| | 70 | +* Fixed regression in unwatch links sent out in notification emails. When the |
| | 71 | + mailing job was deferred via the job queue, the title was incorrect. |
| 70 | 72 | |
| 71 | 73 | === Changes since 1.16 beta 1 === |
| 72 | 74 | |