| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | } else { |
| 147 | 147 | $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle ); |
| 148 | 148 | } |
| 149 | | - $wgOut->setSubtitle( wfMsg( 'difference' ) ); |
| | 149 | + $wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) ); |
| 150 | 150 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 151 | 151 | |
| 152 | 152 | if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) { |
| — | — | @@ -219,11 +219,11 @@ |
| 220 | 220 | $newminor = ''; |
| 221 | 221 | |
| 222 | 222 | if ($this->mOldRev->mMinorEdit == 1) { |
| 223 | | - $oldminor = Xml::span( wfMsg( 'minoreditletter'), 'minor' ) . ' '; |
| | 223 | + $oldminor = Xml::span( wfMsg( 'minoreditletter' ), 'minor' ) . ' '; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | if ($this->mNewRev->mMinorEdit == 1) { |
| 227 | | - $newminor = Xml::span( wfMsg( 'minoreditletter'), 'minor' ) . ' '; |
| | 227 | + $newminor = Xml::span( wfMsg( 'minoreditletter' ), 'minor' ) . ' '; |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | $rdel = ''; $ldel = ''; |
| — | — | @@ -231,10 +231,10 @@ |
| 232 | 232 | $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); |
| 233 | 233 | if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) { |
| 234 | 234 | // If revision was hidden from sysops |
| 235 | | - $ldel = wfMsgHtml('rev-delundel'); |
| | 235 | + $ldel = wfMsgHtml( 'rev-delundel' ); |
| 236 | 236 | } else { |
| 237 | 237 | $ldel = $sk->makeKnownLinkObj( $revdel, |
| 238 | | - wfMsgHtml('rev-delundel'), |
| | 238 | + wfMsgHtml( 'rev-delundel' ), |
| 239 | 239 | 'target=' . urlencode( $this->mOldRev->mTitle->getPrefixedDbkey() ) . |
| 240 | 240 | '&oldid=' . urlencode( $this->mOldRev->getId() ) ); |
| 241 | 241 | // Bolden oversighted content |
| — | — | @@ -245,13 +245,13 @@ |
| 246 | 246 | // We don't currently handle well changing the top revision's settings |
| 247 | 247 | if( $this->mNewRev->isCurrent() ) { |
| 248 | 248 | // If revision was hidden from sysops |
| 249 | | - $rdel = wfMsgHtml('rev-delundel'); |
| | 249 | + $rdel = wfMsgHtml( 'rev-delundel' ); |
| 250 | 250 | } else if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) { |
| 251 | 251 | // If revision was hidden from sysops |
| 252 | | - $rdel = wfMsgHtml('rev-delundel'); |
| | 252 | + $rdel = wfMsgHtml( 'rev-delundel' ); |
| 253 | 253 | } else { |
| 254 | 254 | $rdel = $sk->makeKnownLinkObj( $revdel, |
| 255 | | - wfMsgHtml('rev-delundel'), |
| | 255 | + wfMsgHtml( 'rev-delundel' ), |
| 256 | 256 | 'target=' . urlencode( $this->mNewRev->mTitle->getPrefixedDbkey() ) . |
| 257 | 257 | '&oldid=' . urlencode( $this->mNewRev->getId() ) ); |
| 258 | 258 | // Bolden oversighted content |
| — | — | @@ -442,7 +442,7 @@ |
| 443 | 443 | |
| 444 | 444 | $wgOut->addHTML( $header ); |
| 445 | 445 | |
| 446 | | - $wgOut->setSubtitle( wfMsg( 'difference' ) ); |
| | 446 | + $wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) ); |
| 447 | 447 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 448 | 448 | |
| 449 | 449 | wfProfileOut( __METHOD__ ); |
| — | — | @@ -668,7 +668,7 @@ |
| 669 | 669 | |
| 670 | 670 | function localiseLineNumbersCb( $matches ) { |
| 671 | 671 | global $wgLang; |
| 672 | | - return wfMsgExt( 'lineno', array('parseinline'), $wgLang->formatNum( $matches[1] ) ); |
| | 672 | + return wfMsgExt( 'lineno', array( 'parseinline' ), $wgLang->formatNum( $matches[1] ) ); |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -444,8 +444,8 @@ |
| 445 | 445 | * Section anchors now have an "id" attribute as well as a "name" attribute, |
| 446 | 446 | even when Tidy is not used |
| 447 | 447 | * (bug 16026) revision-info, revision-info-current, cannotdelete, |
| 448 | | - redirectedfrom and historywarning messages now use Wiki text rather than raw |
| 449 | | - HTML markup |
| | 448 | + redirectedfrom, historywarning and difference messages now use Wiki text |
| | 449 | + rather than raw HTML markup |
| 450 | 450 | * (bug 13835) Fix rendering of {{filepath:Wiki.png|nowiki}} |
| 451 | 451 | |
| 452 | 452 | === API changes in 1.14 === |