From a45a0d29cc12e8813186049517b81ac7c556775f Mon Sep 17 00:00:00 2001 From: Reedy Date: Mon, 20 Aug 2012 23:08:03 +0100 Subject: [PATCH] Partial revert of 2fabea7eea556aba6eda9b3385d9844123328482 Due to bug 39514 Change-Id: I1e3bc525d0a15bc3ae72db7ff1ce4132a87840db --- skins/CologneBlue.php | 44 +++++++++++++++++++++---------------------- skins/Nostalgia.php | 6 +++--- skins/Standard.php | 28 +++++++++++++-------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index 155dacea34..214d9bc2c0 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -84,14 +84,14 @@ class CologneBlueTemplate extends LegacyTemplate { $s .= ''; $s .= ''; - $s .= '' . $this->msg( 'sitetitle' )->text() . ''; + $s .= '' . wfMsg( 'sitetitle' ) . ''; $s .= ''; $s .= $this->sysLinks(); $s .= ''; $s .= ''; - $s .= htmlspecialchars( $this->msg( 'sitesubtitle' )->text() ) . ''; + $s .= htmlspecialchars( wfMsg( 'sitesubtitle' ) ) . ''; $s .= ''; $s .= ''; @@ -136,7 +136,7 @@ class CologneBlueTemplate extends LegacyTemplate { array( 'known', 'noclasses' ) ), $this->getSkin()->aboutLink(), - $this->searchForm( $this->msg( 'qbfind' )->text() ) + $this->searchForm( wfMsg( 'qbfind' ) ) ) ); $s .= "\n
" . $this->pageStats(); @@ -167,16 +167,16 @@ class CologneBlueTemplate extends LegacyTemplate { $s = array( $this->getSkin()->mainPageLink(), Linker::linkKnown( - Title::newFromText( $this->msg( 'aboutpage' )->inContentLanguage()->text() ), - $this->msg( 'about' )->text() + Title::newFromText( wfMsgForContent( 'aboutpage' ) ), + wfMsg( 'about' ) ), Linker::linkKnown( - Title::newFromText( $this->msg( 'helppage' )->inContentLanguage()->text() ), - $this->msg( 'help' )->text() + Title::newFromText( wfMsgForContent( 'helppage' ) ), + wfMsg( 'help' ) ), Linker::linkKnown( - Title::newFromText( $this->msg( 'faqpage' )->inContentLanguage()->text() ), - $this->msg( 'faq' )->text() + Title::newFromText( wfMsgForContent( 'faqpage' ) ), + wfMsg( 'faq' ) ), Linker::specialLink( 'Specialpages' ) ); @@ -191,14 +191,14 @@ class CologneBlueTemplate extends LegacyTemplate { if ( $this->data['loggedin'] ) { $s[] = Linker::linkKnown( $lo, - $this->msg( 'logout' )->text(), + wfMsg( 'logout' ), array(), $q ); } else { $s[] = Linker::linkKnown( $li, - $this->msg( 'login' )->text(), + wfMsg( 'login' ), array(), $q ); @@ -257,8 +257,8 @@ class CologneBlueTemplate extends LegacyTemplate { $s .= '' . $this->editThisPage() . ''; $s .= $sep . Linker::linkKnown( - Title::newFromText( $this->msg( 'edithelppage' )->inContentLanguage()->text() ), - $this->msg( 'edithelp' )->text() + Title::newFromText( wfMsgForContent( 'edithelppage' ) ), + wfMsg( 'edithelp' ) ); if( $this->data['loggedin'] ) { @@ -311,7 +311,7 @@ class CologneBlueTemplate extends LegacyTemplate { if ( $this->data['loggedin'] ) { $tl = Linker::link( $user->getTalkPage(), - $this->msg( 'mytalk' )->text(), + wfMsg( 'mytalk' ), array(), array(), array( 'known', 'noclasses' ) @@ -322,7 +322,7 @@ class CologneBlueTemplate extends LegacyTemplate { $s .= Linker::link( $user->getUserPage(), - $this->msg( 'mypage' )->text(), + wfMsg( 'mypage' ), array(), array(), array( 'known', 'noclasses' ) @@ -330,7 +330,7 @@ class CologneBlueTemplate extends LegacyTemplate { . $sep . Linker::link( SpecialPage::getSafeTitleFor( 'Contributions', $user->getName() ), - $this->msg( 'mycontris' )->text(), + wfMsg( 'mycontris' ), array(), array(), array( 'known', 'noclasses' ) @@ -352,12 +352,12 @@ class CologneBlueTemplate extends LegacyTemplate { if( $wgSiteSupportPage ) { $s .= $sep . '' - . $this->msg( 'sitesupport' )->text() . ''; + . wfMsg( 'sitesupport' ) . ''; } $s .= $sep . Linker::link( SpecialPage::getTitleFor( 'Specialpages' ), - $this->msg( 'moredotdotdot' )->text(), + wfMsg( 'moredotdotdot' ), array(), array(), array( 'known', 'noclasses' ) @@ -372,7 +372,7 @@ class CologneBlueTemplate extends LegacyTemplate { * @return string */ function menuHead( $key ) { - $s = "\n
" . $this->msg( $key )->text() . "
"; + $s = "\n
" . wfMsg( $key ) . "
"; return $s; } @@ -392,12 +392,12 @@ class CologneBlueTemplate extends LegacyTemplate { $s .= "searchboxes}\" class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\"" . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />
" - . "searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMessage( 'searcharticle' )->text() ) . "\" />"; + . "searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( 'searcharticle' ) ) . "\" />"; if( $wgUseTwoButtonsSearchForm ) { - $s .= "searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( $this->msg( 'search' )->text() ) . "\" />\n"; + $s .= "searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( 'search' ) ) . "\" />\n"; } else { - $s .= '
\n"; + $s .= '
\n"; } $s .= ''; diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php index 295058cb92..98437e2e4f 100644 --- a/skins/Nostalgia.php +++ b/skins/Nostalgia.php @@ -99,8 +99,8 @@ class NostalgiaTemplate extends LegacyTemplate { } else { /* show user page and user talk links */ $user = $this->getSkin()->getUser(); - $s .= $sep . Linker::link( $user->getUserPage(), $this->msg( 'mypage' )->escaped() ); - $s .= $sep . Linker::link( $user->getTalkPage(), $this->msg( 'mytalk' )->escaped() ); + $s .= $sep . Linker::link( $user->getUserPage(), wfMsgHtml( 'mypage' ) ); + $s .= $sep . Linker::link( $user->getTalkPage(), wfMsgHtml( 'mytalk' ) ); if ( $user->getNewtalk() ) { $s .= ' *'; } @@ -109,7 +109,7 @@ class NostalgiaTemplate extends LegacyTemplate { /* show my contributions link */ $s .= $sep . Linker::link( SpecialPage::getSafeTitleFor( 'Contributions', $this->data['username'] ), - $this->msg( 'mycontris' )->escaped() ); + wfMsgHtml( 'mycontris' ) ); /* show my preferences link */ $s .= $sep . Linker::specialLink( 'Preferences' ); /* show upload file link */ diff --git a/skins/Standard.php b/skins/Standard.php index 0b43a13c5a..1114e7d0a1 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -133,7 +133,7 @@ class StandardTemplate extends LegacyTemplate { $s.= Linker::specialLink( 'Watchlist' ) ; $s .= $sep . Linker::linkKnown( SpecialPage::getTitleFor( 'Contributions' ), - $this->msg( 'mycontris' )->text(), + wfMsg( 'mycontris' ), array(), array( 'target' => $this->data['username'] ) ); @@ -158,34 +158,34 @@ class StandardTemplate extends LegacyTemplate { case NS_TEMPLATE_TALK: case NS_HELP_TALK: case NS_CATEGORY_TALK: - $text = $this->msg('viewtalkpage')->text(); + $text = wfMsg('viewtalkpage'); break; case NS_MAIN: - $text = $this->msg( 'articlepage' )->text(); + $text = wfMsg( 'articlepage' ); break; case NS_USER: - $text = $this->msg( 'userpage' )->text(); + $text = wfMsg( 'userpage' ); break; case NS_PROJECT: - $text = $this->msg( 'projectpage' )->text(); + $text = wfMsg( 'projectpage' ); break; case NS_FILE: - $text = $this->msg( 'imagepage' )->text(); + $text = wfMsg( 'imagepage' ); break; case NS_MEDIAWIKI: - $text = $this->msg( 'mediawikipage' )->text(); + $text = wfMsg( 'mediawikipage' ); break; case NS_TEMPLATE: - $text = $this->msg( 'templatepage' )->text(); + $text = wfMsg( 'templatepage' ); break; case NS_HELP: - $text = $this->msg( 'viewhelppage' )->text(); + $text = wfMsg( 'viewhelppage' ); break; case NS_CATEGORY: - $text = $this->msg( 'categorypage' )->text(); + $text = wfMsg( 'categorypage' ); break; default: - $text = $this->msg( 'articlepage' )->text(); + $text = wfMsg( 'articlepage' ); } $link = $title->getText(); @@ -198,7 +198,7 @@ class StandardTemplate extends LegacyTemplate { } elseif( $title->getNamespace() != NS_SPECIAL ) { # we just throw in a "New page" text to tell the user that he's in edit mode, # and to avoid messing with the separator that is prepended to the next item - $s .= '' . $this->msg( 'newpage' )->text() . ''; + $s .= '' . wfMsg( 'newpage' ) . ''; } } @@ -206,7 +206,7 @@ class StandardTemplate extends LegacyTemplate { if( ( $title->isTalkPage() || $this->getSkin()->getOutput()->showNewSectionLink() ) && $action != 'edit' && !$wpPreview ) $s .= '
' . Linker::link( $title, - $this->msg( 'postcomment' )->text(), + wfMsg( 'postcomment' ), array(), array( 'action' => 'edit', @@ -268,7 +268,7 @@ class StandardTemplate extends LegacyTemplate { global $wgSiteSupportPage; if( $wgSiteSupportPage ) { $s .= "\n
' . $this->msg( 'sitesupport' )->text() . ''; + '" class="internal">' . wfMsg( 'sitesupport' ) . ''; } $s .= "\n
\n"; -- 2.20.1