r65027 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r65026‎ | r65027 | r65028 >
Date:14:00, 14 April 2010
Author:demon
Status:ok (Comments)
Tags:
Comment:
Fix regression in unwatch links sent out by enotif. {{FULLPAGENAMEE}} happens to be "RunJobs.php," so hack around it by adding another $NAMEDVAR to enotif_body
Modified paths:
  • /trunk/phase3/includes/UserMailer.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/UserMailer.php
——@@ -472,6 +472,7 @@
473473
474474 $keys['$PAGEMINOREDIT'] = $medit;
475475 $keys['$PAGESUMMARY'] = $summary;
 476+ $keys['$UNWATCHURL'] = $this->title->getFullUrl( 'action=unwatch' );
476477
477478 $subject = strtr( $subject, $keys );
478479
Index: trunk/phase3/languages/messages/MessagesEn.php
——@@ -2653,7 +2653,7 @@
26542654 {{fullurl:{{#special:Watchlist}}/edit}}
26552655
26562656 To delete the page from your watchlist, visit
2657 -{{fullurl:{{FULLPAGENAMEE}}|action=unwatch}}
 2657+$UNWATCHURL
26582658
26592659 Feedback and further assistance:
26602660 {{fullurl:{{MediaWiki:Helppage}}}}',

Follow-up revisions

RevisionCommit summaryAuthorDate
r650281.16wmf4 MFT r65027catrope14:15, 14 April 2010
r65029Follow-up to r65027: Prefix all hidden fields with wp. This was not necessary...btongminh14:47, 14 April 2010
r66945MFT r65027: Fixed unwatch links in notification emails sent out via the job q...tstarling07:38, 27 May 2010
r66971Follow up r65027. Use wfMsgForContent, the message is fully in Content langua...platonides16:35, 27 May 2010

Comments

#Comment by Platonides (talk | contribs)   21:27, 15 April 2010

The appropiate fix would be to set $wgTitle to $title.

Since we aren't setting $wgUSer either, that wfMsg( 'minoredit' ) looks wrong.

#Comment by Tim Starling (talk | contribs)   16:47, 20 April 2010

I'm with you on the second but not the first.

Status & tagging log