From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- includes/SkinLegacy.php | 186 +++++++++++++++++++++++++++--------------------- 1 file changed, 104 insertions(+), 82 deletions(-) (limited to 'includes/SkinLegacy.php') diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php index 77c85a88..e695ba6c 100644 --- a/includes/SkinLegacy.php +++ b/includes/SkinLegacy.php @@ -1,12 +1,25 @@ tag. Split into + * This will be called immediately after the "" tag. Split into * two functions to make it easier to subclass. + * @return string */ function beforeContent() { return $this->doBeforeContent(); @@ -106,21 +120,21 @@ class LegacyTemplate extends BaseTemplate { } $s .= "\n
\n
\n" . - "\n\n"; + "
\n\n"; if ( $this->getSkin()->qbSetting() == 0 ) { - $s .= "'; } $l = $wgLang->alignStart(); - $s .= "\n\n'; @@ -145,14 +159,16 @@ class LegacyTemplate extends BaseTemplate { } /** - * This gets called shortly before the tag. - * @return String HTML to be put before + * This gets called shortly before the "" tag. + * @return String HTML to be put before "" */ function afterContent() { return $this->doAfterContent(); } - /** overloaded by derived classes */ + /** overloaded by derived classes + * @return string + */ function doAfterContent() { return ''; } @@ -166,12 +182,12 @@ class LegacyTemplate extends BaseTemplate { . $this->getSkin()->escapeSearchLink() . "\">\n" . '\n" - . ''; + . ''; if ( $wgUseTwoButtonsSearchForm ) { - $s .= ' \n"; + $s .= ' \n"; } else { - $s .= ' \n"; + $s .= ' \n"; } $s .= ''; @@ -220,7 +236,7 @@ class LegacyTemplate extends BaseTemplate { } // @todo FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline - return implode( $s, wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n" ); + return implode( $s, wfMessage( 'pipe-separator' )->escaped() . "\n" ); } /** @@ -247,7 +263,7 @@ class LegacyTemplate extends BaseTemplate { } $s = $wgLang->pipeList( array( $s, - '' . htmlspecialchars( $varname ) . '' + '' . htmlspecialchars( $varname ) . '' ) ); } } @@ -276,7 +292,7 @@ class LegacyTemplate extends BaseTemplate { if ( count( $s ) ) { global $wgLang; - $out = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); + $out = wfMessage( 'pipe-separator' )->escaped(); $out .= $wgLang->pipeList( $s ); } @@ -285,7 +301,7 @@ class LegacyTemplate extends BaseTemplate { function bottomLinks() { global $wgOut, $wgUser; - $sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n"; + $sep = wfMessage( 'pipe-separator' )->escaped() . "\n"; $s = ''; if ( $wgOut->isArticleRelated() ) { @@ -321,7 +337,7 @@ class LegacyTemplate extends BaseTemplate { $s = implode( $element, $sep ); - if ( $title->getArticleId() ) { + if ( $title->getArticleID() ) { $s .= "\n
"; // Delete/protect/move links for privileged users @@ -345,7 +361,7 @@ class LegacyTemplate extends BaseTemplate { } function otherLanguages() { - global $wgOut, $wgLang, $wgContLang, $wgHideInterlanguageLinks; + global $wgOut, $wgLang, $wgHideInterlanguageLinks; if ( $wgHideInterlanguageLinks ) { return ''; @@ -357,7 +373,7 @@ class LegacyTemplate extends BaseTemplate { return ''; } - $s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' ); + $s = wfMessage( 'otherlanguages' )->text() . wfMessage( 'colon-separator' )->text(); $first = true; if ( $wgLang->isRTL() ) { @@ -366,13 +382,13 @@ class LegacyTemplate extends BaseTemplate { foreach ( $a as $l ) { if ( !$first ) { - $s .= wfMsgExt( 'pipe-separator', 'escapenoentities' ); + $s .= wfMessage( 'pipe-separator' )->escaped(); } $first = false; $nt = Title::newFromText( $l ); - $text = $wgContLang->getLanguageName( $nt->getInterwiki() ); + $text = Language::fetchLanguageName( $nt->getInterwiki() ); $s .= Html::element( 'a', array( 'href' => $nt->getFullURL(), 'title' => $nt->getText(), 'class' => "external" ), @@ -388,6 +404,7 @@ class LegacyTemplate extends BaseTemplate { /** * Show a drop-down box of special pages + * @return string */ function specialPagesList() { global $wgScript; @@ -400,8 +417,9 @@ class LegacyTemplate extends BaseTemplate { $obj->getTitle()->getPrefixedDBkey() ); } - return Html::rawElement( 'form', array( 'id' => 'specialpages', 'method' => 'get', - 'action' => $wgScript ), $select->getHTML() . Xml::submitButton( wfMsg( 'go' ) ) ); + return Html::rawElement( 'form', + array( 'id' => 'specialpages', 'method' => 'get', 'action' => $wgScript ), + $select->getHTML() . Xml::submitButton( wfMessage( 'go' )->text() ) ); } function pageTitleLinks() { @@ -429,21 +447,21 @@ class LegacyTemplate extends BaseTemplate { if ( $wgOut->isArticleRelated() ) { if ( $title->getNamespace() == NS_FILE ) { - $name = $title->getDBkey(); $image = wfFindFile( $title ); if ( $image ) { - $link = htmlspecialchars( $image->getURL() ); - $style = Linker::getInternalLinkAttributes( $link, $name ); - $s[] = "{$name}"; + $href = $image->getURL(); + $s[] = Html::element( 'a', array( 'href' => $href, + 'title' => $href ), $title->getText() ); + } } } if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) { $s[] .= Linker::linkKnown( - $title, - wfMsg( 'currentrev' ) + $title, + wfMessage( 'currentrev' )->text() ); } @@ -453,18 +471,18 @@ class LegacyTemplate extends BaseTemplate { if ( !$title->equals( $wgUser->getTalkPage() ) ) { $tl = Linker::linkKnown( $wgUser->getTalkPage(), - wfMsgHtml( 'newmessageslink' ), + wfMessage( 'newmessageslink' )->escaped(), array(), array( 'redirect' => 'no' ) ); $dl = Linker::linkKnown( $wgUser->getTalkPage(), - wfMsgHtml( 'newmessagesdifflink' ), + wfMessage( 'newmessagesdifflink' )->escaped(), array(), array( 'diff' => 'cur' ) ); - $s[] = '' . wfMsg( 'youhavenewmessages', $tl, $dl ) . ''; + $s[] = '' . wfMessage( 'youhavenewmessages', $tl, $dl )->text() . ''; # disable caching $wgOut->setSquidMaxage( 0 ); $wgOut->enableClientCache( false ); @@ -497,7 +515,7 @@ class LegacyTemplate extends BaseTemplate { if ( $sub == '' ) { global $wgExtraSubtitle; - $sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle; + $sub = wfMessage( 'tagline' )->parse() . $wgExtraSubtitle; } $subpages = $this->getSkin()->subPageSubtitle(); @@ -515,14 +533,15 @@ class LegacyTemplate extends BaseTemplate { if ( !$wgOut->isPrintable() ) { $printurl = htmlspecialchars( $this->getSkin()->getTitle()->getLocalUrl( $wgRequest->appendQueryValue( 'printable', 'yes', true ) ) ); - $s[] = "" . wfMsg( 'printableversion' ) . ''; + $s[] = "" + . wfMessage( 'printableversion' )->text() . ''; } if ( $wgOut->isSyndicated() ) { foreach ( $wgOut->getSyndicationLinks() as $format => $link ) { $feedurl = htmlspecialchars( $link ); $s[] = "" . wfMsgHtml( "feed-$format" ) . ""; + . " class=\"feedlink\">" . wfMessage( "feed-$format" )->escaped() . ""; } } return $wgLang->pipeList( $s ); @@ -530,6 +549,7 @@ class LegacyTemplate extends BaseTemplate { /** * @deprecated in 1.19 + * @return string */ function getQuickbarCompensator( $rows = 1 ) { wfDeprecated( __METHOD__, '1.19' ); @@ -540,15 +560,15 @@ class LegacyTemplate extends BaseTemplate { global $wgOut; if ( !$wgOut->isArticleRelated() ) { - $s = wfMsg( 'protectedpage' ); + $s = wfMessage( 'protectedpage' )->text(); } else { $title = $this->getSkin()->getTitle(); if ( $title->quickUserCan( 'edit' ) && $title->exists() ) { - $t = wfMsg( 'editthispage' ); + $t = wfMessage( 'editthispage' )->text(); } elseif ( $title->quickUserCan( 'create' ) && !$title->exists() ) { - $t = wfMsg( 'create-this-page' ); + $t = wfMessage( 'create-this-page' )->text(); } else { - $t = wfMsg( 'viewsource' ); + $t = wfMessage( 'viewsource' )->text(); } $s = Linker::linkKnown( @@ -568,8 +588,8 @@ class LegacyTemplate extends BaseTemplate { $diff = $wgRequest->getVal( 'diff' ); $title = $this->getSkin()->getTitle(); - if ( $title->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) { - $t = wfMsg( 'deletethispage' ); + if ( $title->getArticleID() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) { + $t = wfMessage( 'deletethispage' )->text(); $s = Linker::linkKnown( $title, @@ -590,12 +610,12 @@ class LegacyTemplate extends BaseTemplate { $diff = $wgRequest->getVal( 'diff' ); $title = $this->getSkin()->getTitle(); - if ( $title->getArticleId() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) { + if ( $title->getArticleID() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) { if ( $title->isProtected() ) { - $text = wfMsg( 'unprotectthispage' ); + $text = wfMessage( 'unprotectthispage' )->text(); $query = array( 'action' => 'unprotect' ); } else { - $text = wfMsg( 'protectthispage' ); + $text = wfMessage( 'protectthispage' )->text(); $query = array( 'action' => 'protect' ); } @@ -620,15 +640,15 @@ class LegacyTemplate extends BaseTemplate { $title = $this->getSkin()->getTitle(); if ( $wgOut->isArticleRelated() ) { - if ( $title->userIsWatching() ) { - $text = wfMsg( 'unwatchthispage' ); + if ( $wgUser->isWatched( $title ) ) { + $text = wfMessage( 'unwatchthispage' )->text(); $query = array( 'action' => 'unwatch', 'token' => UnwatchAction::getUnwatchToken( $title, $wgUser ), ); $id = 'mw-unwatch-link' . $this->mWatchLinkNum; } else { - $text = wfMsg( 'watchthispage' ); + $text = wfMessage( 'watchthispage' )->text(); $query = array( 'action' => 'watch', 'token' => WatchAction::getWatchToken( $title, $wgUser ), @@ -643,7 +663,7 @@ class LegacyTemplate extends BaseTemplate { $query ); } else { - $s = wfMsg( 'notanarticle' ); + $s = wfMessage( 'notanarticle' )->text(); } return $s; @@ -653,7 +673,7 @@ class LegacyTemplate extends BaseTemplate { if ( $this->getSkin()->getTitle()->quickUserCan( 'move' ) ) { return Linker::linkKnown( SpecialPage::getTitleFor( 'Movepage' ), - wfMsg( 'movethispage' ), + wfMessage( 'movethispage' )->text(), array(), array( 'target' => $this->getSkin()->getTitle()->getPrefixedDBkey() ) ); @@ -666,7 +686,7 @@ class LegacyTemplate extends BaseTemplate { function historyLink() { return Linker::link( $this->getSkin()->getTitle(), - wfMsgHtml( 'history' ), + wfMessage( 'history' )->escaped(), array( 'rel' => 'archives' ), array( 'action' => 'history' ) ); @@ -675,21 +695,21 @@ class LegacyTemplate extends BaseTemplate { function whatLinksHere() { return Linker::linkKnown( SpecialPage::getTitleFor( 'Whatlinkshere', $this->getSkin()->getTitle()->getPrefixedDBkey() ), - wfMsgHtml( 'whatlinkshere' ) + wfMessage( 'whatlinkshere' )->escaped() ); } function userContribsLink() { return Linker::linkKnown( SpecialPage::getTitleFor( 'Contributions', $this->getSkin()->getTitle()->getDBkey() ), - wfMsgHtml( 'contributions' ) + wfMessage( 'contributions' )->escaped() ); } function emailUserLink() { return Linker::linkKnown( SpecialPage::getTitleFor( 'Emailuser', $this->getSkin()->getTitle()->getDBkey() ), - wfMsgHtml( 'emailuser' ) + wfMessage( 'emailuser' )->escaped() ); } @@ -697,11 +717,11 @@ class LegacyTemplate extends BaseTemplate { global $wgOut; if ( !$wgOut->isArticleRelated() ) { - return '(' . wfMsg( 'notanarticle' ) . ')'; + return wfMessage( 'parentheses', wfMessage( 'notanarticle' )->text() )->escaped(); } else { return Linker::linkKnown( SpecialPage::getTitleFor( 'Recentchangeslinked', $this->getSkin()->getTitle()->getPrefixedDBkey() ), - wfMsgHtml( 'recentchangeslinked-toolbox' ) + wfMessage( 'recentchangeslinked-toolbox' )->escaped() ); } } @@ -719,41 +739,41 @@ class LegacyTemplate extends BaseTemplate { $link = $title->getSubjectPage(); switch( $link->getNamespace() ) { case NS_MAIN: - $text = wfMsg( 'articlepage' ); + $text = wfMessage( 'articlepage' ); break; case NS_USER: - $text = wfMsg( 'userpage' ); + $text = wfMessage( 'userpage' ); break; case NS_PROJECT: - $text = wfMsg( 'projectpage' ); + $text = wfMessage( 'projectpage' ); break; case NS_FILE: - $text = wfMsg( 'imagepage' ); + $text = wfMessage( 'imagepage' ); # Make link known if image exists, even if the desc. page doesn't. if ( wfFindFile( $link ) ) $linkOptions[] = 'known'; break; case NS_MEDIAWIKI: - $text = wfMsg( 'mediawikipage' ); + $text = wfMessage( 'mediawikipage' ); break; case NS_TEMPLATE: - $text = wfMsg( 'templatepage' ); + $text = wfMessage( 'templatepage' ); break; case NS_HELP: - $text = wfMsg( 'viewhelppage' ); + $text = wfMessage( 'viewhelppage' ); break; case NS_CATEGORY: - $text = wfMsg( 'categorypage' ); + $text = wfMessage( 'categorypage' ); break; default: - $text = wfMsg( 'articlepage' ); + $text = wfMessage( 'articlepage' ); } } else { $link = $title->getTalkPage(); - $text = wfMsg( 'talkpage' ); + $text = wfMessage( 'talkpage' ); } - $s = Linker::link( $link, $text, array(), array(), $linkOptions ); + $s = Linker::link( $link, $text->text(), array(), array(), $linkOptions ); return $s; } @@ -775,7 +795,7 @@ class LegacyTemplate extends BaseTemplate { return Linker::linkKnown( $title, - wfMsg( 'postcomment' ), + wfMessage( 'postcomment' )->text(), array(), array( 'action' => 'edit', @@ -789,11 +809,13 @@ class LegacyTemplate extends BaseTemplate { if ( $wgUploadNavigationUrl ) { # Using an empty class attribute to avoid automatic setting of "external" class - return Linker::makeExternalLink( $wgUploadNavigationUrl, wfMsgHtml( 'upload' ), false, null, array( 'class' => '' ) ); + return Linker::makeExternalLink( $wgUploadNavigationUrl, + wfMessage( 'upload' )->escaped(), + false, null, array( 'class' => '' ) ); } else { return Linker::linkKnown( SpecialPage::getTitleFor( 'Upload' ), - wfMsgHtml( 'upload' ) + wfMessage( 'upload' )->escaped() ); } } @@ -810,10 +832,11 @@ class LegacyTemplate extends BaseTemplate { $talkLink = Linker::link( $wgUser->getTalkPage(), $wgLang->getNsText( NS_TALK ) ); + $talkLink = wfMessage( 'parentheses' )->rawParams( $talkLink )->escaped(); - $ret .= "$name ($talkLink)"; + $ret .= "$name $talkLink"; } else { - $ret .= wfMsg( 'notloggedin' ); + $ret .= wfMessage( 'notloggedin' )->text(); } $query = array(); @@ -827,18 +850,19 @@ class LegacyTemplate extends BaseTemplate { : 'login'; $ret .= "\n
" . Linker::link( SpecialPage::getTitleFor( 'Userlogin' ), - wfMsg( $loginlink ), array(), $query + wfMessage( $loginlink )->text(), array(), $query ); } else { $talkLink = Linker::link( $wgUser->getTalkPage(), $wgLang->getNsText( NS_TALK ) ); + $talkLink = wfMessage( 'parentheses' )->rawParams( $talkLink )->escaped(); $ret .= Linker::link( $wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) ); - $ret .= " ($talkLink)
"; + $ret .= " $talkLink
"; $ret .= $wgLang->pipeList( array( Linker::link( - SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ), + SpecialPage::getTitleFor( 'Userlogout' ), wfMessage( 'logout' )->text(), array(), array( 'returnto' => $returnTo->getPrefixedDBkey() ) ), Linker::specialLink( 'Preferences' ), @@ -848,13 +872,11 @@ class LegacyTemplate extends BaseTemplate { $ret = $wgLang->pipeList( array( $ret, Linker::link( - Title::newFromText( wfMsgForContent( 'helppage' ) ), - wfMsg( 'help' ) + Title::newFromText( wfMessage( 'helppage' )->inContentLanguage()->text() ), + wfMessage( 'help' )->text() ), ) ); return $ret; } - } - -- cgit v1.2.2
\n" . + $s .= "\n" . $this->getSkin()->logoText( $wgLang->alignStart() ) . '\n"; + $s .= "\n"; $s .= $this->topLinks(); $s .= '

' . $this->pageTitleLinks() . "

\n"; $r = $wgLang->alignEnd(); - $s .= "		"; + $s .= ""; $s .= $this->nameAndLogin(); $s .= "\n
" . $this->searchForm() . '