r53800 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r53799‎ | r53800 | r53801 >
Date:10:32, 27 July 2009
Author:werdna
Status:ok
Tags:
Comment:
Allow HTML in message emailnotauthenticated, fixes formatting regression caused by r53173 and bug 19820
Modified paths:
  • /trunk/phase3/includes/Preferences.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Preferences.php
@@ -311,13 +311,14 @@
312312 $time = $wgLang->timeAndDate( $user->getEmailAuthenticationTimestamp(), true );
313313 $d = $wgLang->date( $user->getEmailAuthenticationTimestamp(), true );
314314 $t = $wgLang->time( $user->getEmailAuthenticationTimestamp(), true );
315 - $emailauthenticated = htmlspecialchars( wfMsg( 'emailauthenticated', $time, $d, $t ) ) . '<br />';
 315+ $emailauthenticated = wfMsgExt( 'emailauthenticated', 'parseinline',
 316+ array($time, $d, $t ) ) . '<br />';
316317 $disableEmailPrefs = false;
317318 } else {
318319 $disableEmailPrefs = true;
319320 global $wgUser; // wgUser is okay here, it's for display
320321 $skin = $wgUser->getSkin();
321 - $emailauthenticated = wfMsgHtml( 'emailnotauthenticated' ) . '<br />' .
 322+ $emailauthenticated = wfMsgExt( 'emailnotauthenticated', 'parseinline' ) . '<br />' .
322323 $skin->link(
323324 SpecialPage::getTitleFor( 'Confirmemail' ),
324325 wfMsg( 'emailconfirmlink' ),

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r53173Fix dodgy uses of wfMsgHtml() and related HTML escapingtstarling15:36, 13 July 2009

Status & tagging log