Fix regression in unwatch links sent out by enotif. {{FULLPAGENAMEE}} happens to...

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index ce3ca9e..daf8b62 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -472,6 +472,7 @@ class EmailNotification {
 
                $keys['$PAGEMINOREDIT']      = $medit;
                $keys['$PAGESUMMARY']        = $summary;
+               $keys['$UNWATCHURL']         = $this->title->getFullUrl( 'action=unwatch' );
 
                $subject = strtr( $subject, $keys );
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 253fb5d..93dfeea 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2653,7 +2653,7 @@ To change your watchlist settings, visit
 {{fullurl:{{#special:Watchlist}}/edit}}
 
 To delete the page from your watchlist, visit
-{{fullurl:{{FULLPAGENAMEE}}|action=unwatch}}
+$UNWATCHURL
 
 Feedback and further assistance:
 {{fullurl:{{MediaWiki:Helppage}}}}',