diff options
Diffstat (limited to 'includes/SkinTemplate.php')
-rw-r--r-- | includes/SkinTemplate.php | 821 |
1 files changed, 363 insertions, 458 deletions
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index ef104bd7..e41b5e7d 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -131,23 +131,31 @@ class SkinTemplate extends Skin { * * @param $out OutputPage */ - function outputPage( OutputPage $out ) { - global $wgUser, $wgLang, $wgContLang; + function outputPage( OutputPage $out=null ) { + global $wgContLang; global $wgScript, $wgStylePath; - global $wgMimeType, $wgJsMimeType, $wgRequest; + global $wgMimeType, $wgJsMimeType; global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version; - global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks; + global $wgDisableCounters, $wgSitename, $wgLogo, $wgHideInterlanguageLinks; global $wgMaxCredits, $wgShowCreditsIfMax; global $wgPageShowWatchingUsers; - global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments; + global $wgDebugComments; global $wgArticlePath, $wgScriptPath, $wgServer; wfProfileIn( __METHOD__ ); Profiler::instance()->setTemplated( true ); - $oldid = $wgRequest->getVal( 'oldid' ); - $diff = $wgRequest->getVal( 'diff' ); - $action = $wgRequest->getVal( 'action', 'view' ); + $oldContext = null; + if ( $out !== null ) { + // @todo Add wfDeprecated in 1.20 + $oldContext = $this->getContext(); + $this->setContext( $out->getContext() ); + } + + $out = $this->getOutput(); + $request = $this->getRequest(); + $user = $this->getUser(); + $title = $this->getTitle(); wfProfileIn( __METHOD__ . '-init' ); $this->initPage( $out ); @@ -156,24 +164,21 @@ class SkinTemplate extends Skin { wfProfileOut( __METHOD__ . '-init' ); wfProfileIn( __METHOD__ . '-stuff' ); - $this->thispage = $this->getTitle()->getPrefixedDBkey(); - $this->userpage = $wgUser->getUserPage()->getPrefixedText(); - + $this->thispage = $title->getPrefixedDBkey(); + $this->titletxt = $title->getPrefixedText(); + $this->userpage = $user->getUserPage()->getPrefixedText(); $query = array(); - if ( !$wgRequest->wasPosted() ) { - $query = $wgRequest->getValues(); + if ( !$request->wasPosted() ) { + $query = $request->getValues(); unset( $query['title'] ); unset( $query['returnto'] ); unset( $query['returntoquery'] ); } $this->thisquery = wfArrayToCGI( $query ); - $this->loggedin = $wgUser->isLoggedIn(); - $this->iscontent = ( $this->getTitle()->getNamespace() != NS_SPECIAL ); - $this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) ); - $this->username = $wgUser->getName(); - - if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) { + $this->loggedin = $user->isLoggedIn(); + $this->username = $user->getName(); + if ( $this->loggedin || $this->showIPinHeader() ) { $this->userpageUrlDetails = self::makeUrlDetails( $this->userpage ); } else { # This won't be used in the standard skins, but we define it to preserve the interface @@ -181,48 +186,25 @@ class SkinTemplate extends Skin { $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage ); } - $this->titletxt = $this->getTitle()->getPrefixedText(); wfProfileOut( __METHOD__ . '-stuff' ); wfProfileIn( __METHOD__ . '-stuff-head' ); - if ( $this->useHeadElement ) { - $pagecss = $this->setupPageCss(); - if( $pagecss ) - $out->addInlineStyle( $pagecss ); - } else { - $this->setupUserCss( $out ); - - $tpl->set( 'pagecss', $this->setupPageCss() ); + if ( !$this->useHeadElement ) { + $tpl->set( 'pagecss', false ); $tpl->set( 'usercss', false ); - $this->userjs = $this->userjsprev = false; - # @todo FIXME: This is the only use of OutputPage::isUserJsAllowed() anywhere; can we - # get rid of it? For that matter, why is any of this here at all? - $this->setupUserJs( $out->isUserJsAllowed() ); - $tpl->setRef( 'userjs', $this->userjs ); - $tpl->setRef( 'userjsprev', $this->userjsprev ); - - if( $wgUseSiteJs ) { - $jsCache = $this->loggedin ? '&smaxage=0' : ''; - $tpl->set( 'jsvarurl', - self::makeUrl( '-', - "action=raw$jsCache&gen=js&useskin=" . - urlencode( $this->getSkinName() ) ) ); - } else { - $tpl->set( 'jsvarurl', false ); - } + $tpl->set( 'userjs', false ); + $tpl->set( 'userjsprev', false ); + + $tpl->set( 'jsvarurl', false ); $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace ); $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces ); $tpl->set( 'html5version', $wgHtml5Version ); - $tpl->set( 'headlinks', $out->getHeadLinks( $this ) ); - $tpl->set( 'csslinks', $out->buildCssLinks( $this ) ); - - if( $wgUseTrackbacks && $out->isArticleRelated() ) { - $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() ); - } else { - $tpl->set( 'trackbackhtml', null ); - } + $tpl->set( 'headlinks', $out->getHeadLinks() ); + $tpl->set( 'csslinks', $out->buildCssLinks() ); + $tpl->set( 'pageclass', $this->getPageClasses( $title ) ); + $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) ); } wfProfileOut( __METHOD__ . '-stuff-head' ); @@ -230,42 +212,33 @@ class SkinTemplate extends Skin { $tpl->set( 'title', $out->getPageTitle() ); $tpl->set( 'pagetitle', $out->getHTMLTitle() ); $tpl->set( 'displaytitle', $out->mPageLinkTitle ); - $tpl->set( 'pageclass', $this->getPageClasses( $this->getTitle() ) ); - $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) ); - $nsname = MWNamespace::exists( $this->getTitle()->getNamespace() ) ? - MWNamespace::getCanonicalName( $this->getTitle()->getNamespace() ) : - $this->getTitle()->getNsText(); - - $tpl->set( 'nscanonical', $nsname ); - $tpl->set( 'nsnumber', $this->getTitle()->getNamespace() ); - $tpl->set( 'titleprefixeddbkey', $this->getTitle()->getPrefixedDBKey() ); - $tpl->set( 'titletext', $this->getTitle()->getText() ); - $tpl->set( 'articleid', $this->getTitle()->getArticleId() ); - $tpl->set( 'currevisionid', $this->getTitle()->getLatestRevID() ); + $tpl->setRef( 'thispage', $this->thispage ); + $tpl->setRef( 'titleprefixeddbkey', $this->thispage ); + $tpl->set( 'titletext', $title->getText() ); + $tpl->set( 'articleid', $title->getArticleId() ); $tpl->set( 'isarticle', $out->isArticle() ); - $tpl->setRef( 'thispage', $this->thispage ); $subpagestr = $this->subPageSubtitle(); - $tpl->set( - 'subtitle', !empty( $subpagestr ) ? - '<span class="subpages">' . $subpagestr . '</span>' . $out->getSubtitle() : - $out->getSubtitle() - ); + if ( $subpagestr !== '' ) { + $subpagestr = '<span class="subpages">' . $subpagestr . '</span>'; + } + $tpl->set( 'subtitle', $subpagestr . $out->getSubtitle() ); + $undelete = $this->getUndeleteLink(); - $tpl->set( - 'undelete', !empty( $undelete ) ? - '<span class="subpages">' . $undelete . '</span>' : - '' - ); + if ( $undelete === '' ) { + $tpl->set( 'undelete', '' ); + } else { + $tpl->set( 'undelete', '<span class="subpages">' . $undelete . '</span>' ); + } $tpl->set( 'catlinks', $this->getCategories() ); if( $out->isSyndicated() ) { $feeds = array(); foreach( $out->getSyndicationLinks() as $format => $link ) { $feeds[$format] = array( - 'text' => wfMsg( "feed-$format" ), + 'text' => $this->msg( "feed-$format" )->text(), 'href' => $link ); } @@ -280,39 +253,40 @@ class SkinTemplate extends Skin { $tpl->setRef( 'wgScript', $wgScript ); $tpl->setRef( 'skinname', $this->skinname ); $tpl->set( 'skinclass', get_class( $this ) ); + $tpl->setRef( 'skin', $this ); $tpl->setRef( 'stylename', $this->stylename ); $tpl->set( 'printable', $out->isPrintable() ); - $tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) ); + $tpl->set( 'handheld', $request->getBool( 'handheld' ) ); $tpl->setRef( 'loggedin', $this->loggedin ); - $tpl->set( 'notspecialpage', $this->getTitle()->getNamespace() != NS_SPECIAL ); + $tpl->set( 'notspecialpage', !$title->isSpecialPage() ); /* XXX currently unused, might get useful later - $tpl->set( 'editable', ( $this->getTitle()->getNamespace() != NS_SPECIAL ) ); - $tpl->set( 'exists', $this->getTitle()->getArticleID() != 0 ); - $tpl->set( 'watch', $this->getTitle()->userIsWatching() ? 'unwatch' : 'watch' ); - $tpl->set( 'protect', count( $this->getTitle()->isProtected() ) ? 'unprotect' : 'protect' ); - $tpl->set( 'helppage', wfMsg( 'helppage' ) ); + $tpl->set( 'editable', ( !$title->isSpecialPage() ) ); + $tpl->set( 'exists', $title->getArticleID() != 0 ); + $tpl->set( 'watch', $title->userIsWatching() ? 'unwatch' : 'watch' ); + $tpl->set( 'protect', count( $title->isProtected() ) ? 'unprotect' : 'protect' ); + $tpl->set( 'helppage', $this->msg( 'helppage' )->text() ); */ $tpl->set( 'searchaction', $this->escapeSearchLink() ); $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBKey() ); - $tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) ); + $tpl->set( 'search', trim( $request->getVal( 'search' ) ) ); $tpl->setRef( 'stylepath', $wgStylePath ); $tpl->setRef( 'articlepath', $wgArticlePath ); $tpl->setRef( 'scriptpath', $wgScriptPath ); $tpl->setRef( 'serverurl', $wgServer ); $tpl->setRef( 'logopath', $wgLogo ); + $tpl->setRef( 'sitename', $wgSitename ); - $contentlang = $wgContLang->getCode(); - $contentdir = $wgContLang->getDir(); - $userlang = $wgLang->getCode(); - $userdir = $wgLang->getDir(); + $lang = $this->getLanguage(); + $userlang = $lang->getHtmlCode(); + $userdir = $lang->getDir(); $tpl->set( 'lang', $userlang ); $tpl->set( 'dir', $userdir ); - $tpl->set( 'rtl', $wgLang->isRTL() ); + $tpl->set( 'rtl', $lang->isRTL() ); - $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' ); - $tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) ); - $tpl->set( 'username', $wgUser->isAnon() ? null : $this->username ); + $tpl->set( 'capitalizeallnouns', $lang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' ); + $tpl->set( 'showjumplinks', $user->getOption( 'showjumplinks' ) ); + $tpl->set( 'username', $this->loggedin ? $this->username : null ); $tpl->setRef( 'userpage', $this->userpage ); $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] ); $tpl->set( 'userlang', $userlang ); @@ -323,79 +297,52 @@ class SkinTemplate extends Skin { $tpl->set( 'userlangattributes', '' ); $tpl->set( 'specialpageattributes', '' ); # obsolete - if ( $userlang !== $contentlang || $userdir !== $contentdir ) { + if ( $userlang !== $wgContLang->getHtmlCode() || $userdir !== $wgContLang->getDir() ) { $attrs = " lang='$userlang' dir='$userdir'"; $tpl->set( 'userlangattributes', $attrs ); } - $newtalks = $this->getNewtalks( $out ); - wfProfileOut( __METHOD__ . '-stuff2' ); wfProfileIn( __METHOD__ . '-stuff3' ); - $tpl->setRef( 'newtalk', $newtalks ); - $tpl->setRef( 'skin', $this ); + $tpl->set( 'newtalk', $this->getNewtalks() ); $tpl->set( 'logo', $this->logoText() ); - if ( $out->isArticle() && ( !isset( $oldid ) || isset( $diff ) ) && - $this->getTitle()->exists() ) - { - $article = new Article( $this->getTitle(), 0 ); - if ( !$wgDisableCounters ) { - $viewcount = $wgLang->formatNum( $article->getCount() ); - if ( $viewcount ) { - $tpl->set( 'viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) ); - } else { - $tpl->set( 'viewcount', false ); + + $tpl->set( 'copyright', false ); + $tpl->set( 'viewcount', false ); + $tpl->set( 'lastmod', false ); + $tpl->set( 'credits', false ); + $tpl->set( 'numberofwatchingusers', false ); + if ( $out->isArticle() && $title->exists() ) { + if ( $this->isRevisionCurrent() ) { + if ( !$wgDisableCounters ) { + $viewcount = $this->getWikiPage()->getCount(); + if ( $viewcount ) { + $tpl->set( 'viewcount', $this->msg( 'viewcount' )->numParams( $viewcount )->parse() ); + } } - } else { - $tpl->set( 'viewcount', false ); - } - if( $wgPageShowWatchingUsers ) { - $dbr = wfGetDB( DB_SLAVE ); - $res = $dbr->select( 'watchlist', - array( 'COUNT(*) AS n' ), - array( 'wl_title' => $dbr->strencode( $this->getTitle()->getDBkey() ), 'wl_namespace' => $this->getTitle()->getNamespace() ), - __METHOD__ - ); - $x = $dbr->fetchObject( $res ); - $numberofwatchingusers = $x->n; - if( $numberofwatchingusers > 0 ) { - $tpl->set( 'numberofwatchingusers', - wfMsgExt( 'number_of_watching_users_pageview', array( 'parseinline' ), - $wgLang->formatNum( $numberofwatchingusers ) ) + if( $wgPageShowWatchingUsers ) { + $dbr = wfGetDB( DB_SLAVE ); + $num = $dbr->selectField( 'watchlist', 'COUNT(*)', + array( 'wl_title' => $title->getDBkey(), 'wl_namespace' => $title->getNamespace() ), + __METHOD__ ); - } else { - $tpl->set( 'numberofwatchingusers', false ); + if( $num > 0 ) { + $tpl->set( 'numberofwatchingusers', + $this->msg( 'number_of_watching_users_pageview' )->numParams( $num )->parse() + ); + } } - } else { - $tpl->set( 'numberofwatchingusers', false ); - } - $tpl->set( 'copyright', $this->getCopyright() ); - - $this->credits = false; - - if( $wgMaxCredits != 0 ){ - $this->credits = Action::factory( 'credits', $article )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ); - } else { - $tpl->set( 'lastmod', $this->lastModified( $article ) ); + if ( $wgMaxCredits != 0 ) { + $tpl->set( 'credits', Action::factory( 'credits', $this->getWikiPage(), + $this->getContext() )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) ); + } else { + $tpl->set( 'lastmod', $this->lastModified() ); + } } - - $tpl->setRef( 'credits', $this->credits ); - - } elseif ( isset( $oldid ) && !isset( $diff ) ) { $tpl->set( 'copyright', $this->getCopyright() ); - $tpl->set( 'viewcount', false ); - $tpl->set( 'lastmod', false ); - $tpl->set( 'credits', false ); - $tpl->set( 'numberofwatchingusers', false ); - } else { - $tpl->set( 'copyright', false ); - $tpl->set( 'viewcount', false ); - $tpl->set( 'lastmod', false ); - $tpl->set( 'credits', false ); - $tpl->set( 'numberofwatchingusers', false ); } wfProfileOut( __METHOD__ . '-stuff3' ); @@ -446,23 +393,27 @@ class SkinTemplate extends Skin { $tpl->set( 'debug', '' ); } - $tpl->set( 'reporttime', wfReportTime() ); $tpl->set( 'sitenotice', $this->getSiteNotice() ); - $tpl->set( 'bottomscripts', $this->bottomScripts( $out ) ); + $tpl->set( 'bottomscripts', $this->bottomScripts() ); $tpl->set( 'printfooter', $this->printSource() ); - # Add a <div class="mw-content-ltr/rtl"> around the body text + # An ID that includes the actual body text; without categories, contentSub, ... + $realBodyAttribs = array( 'id' => 'mw-content-text' ); + + # Add a mw-content-ltr/rtl class to be able to style based on text direction + # when the content is different from the UI language, i.e.: # not for special pages or file pages AND only when viewing AND if the page exists # (or is in MW namespace, because that has default content) - if( !in_array( $this->getTitle()->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) && - in_array( $action, array( 'view', 'historysubmit' ) ) && - ( $this->getTitle()->exists() || $this->getTitle()->getNamespace() == NS_MEDIAWIKI ) ) { - $pageLang = $this->getTitle()->getPageLanguage(); - $realBodyAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(), - 'class' => 'mw-content-'.$pageLang->getDir() ); - $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext ); + if( !in_array( $title->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) && + in_array( $request->getVal( 'action', 'view' ), array( 'view', 'historysubmit' ) ) && + ( $title->exists() || $title->getNamespace() == NS_MEDIAWIKI ) ) { + $pageLang = $title->getPageLanguage(); + $realBodyAttribs['lang'] = $pageLang->getHtmlCode(); + $realBodyAttribs['dir'] = $pageLang->getDir(); + $realBodyAttribs['class'] = 'mw-content-'.$pageLang->getDir(); } + $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext ); $tpl->setRef( 'bodytext', $out->mBodytext ); # Language links @@ -496,23 +447,24 @@ class SkinTemplate extends Skin { wfProfileIn( __METHOD__ . '-stuff5' ); # Personal toolbar - $tpl->set( 'personal_urls', $this->buildPersonalUrls( $out ) ); - $content_navigation = $this->buildContentNavigationUrls( $out ); + $tpl->set( 'personal_urls', $this->buildPersonalUrls() ); + $content_navigation = $this->buildContentNavigationUrls(); $content_actions = $this->buildContentActionUrls( $content_navigation ); $tpl->setRef( 'content_navigation', $content_navigation ); $tpl->setRef( 'content_actions', $content_actions ); $tpl->set( 'sidebar', $this->buildSidebar() ); - $tpl->set( 'nav_urls', $this->buildNavUrls( $out ) ); + $tpl->set( 'nav_urls', $this->buildNavUrls() ); // Set the head scripts near the end, in case the above actions resulted in added scripts if ( $this->useHeadElement ) { $tpl->set( 'headelement', $out->headElement( $this ) ); } else { - $tpl->set( 'headscripts', $out->getScript() ); + $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() ); } $tpl->set( 'debughtml', $this->generateDebugHTML() ); + $tpl->set( 'reporttime', wfReportTime() ); // original version by hansm if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) { @@ -540,6 +492,10 @@ class SkinTemplate extends Skin { // result may be an error $this->printOrError( $res ); + + if ( $oldContext ) { + $this->setContext( $oldContext ); + } wfProfileOut( __METHOD__ ); } @@ -572,26 +528,25 @@ class SkinTemplate extends Skin { * build array of urls for personal toolbar * @return array */ - protected function buildPersonalUrls( OutputPage $out ) { - global $wgRequest; - - $title = $out->getTitle(); + protected function buildPersonalUrls() { + $title = $this->getTitle(); + $request = $this->getRequest(); $pageurl = $title->getLocalURL(); wfProfileIn( __METHOD__ ); /* set up the default links for the personal toolbar */ $personal_urls = array(); - - # Due to bug 32276, if a user does not have read permissions, - # $this->getTitle() will just give Special:Badtitle, which is - # not especially useful as a returnto parameter. Use the title + + # Due to bug 32276, if a user does not have read permissions, + # $this->getTitle() will just give Special:Badtitle, which is + # not especially useful as a returnto parameter. Use the title # from the request instead, if there was one. - $page = Title::newFromURL( $wgRequest->getVal( 'title', '' ) ); - $page = $wgRequest->getVal( 'returnto', $page ); + $page = Title::newFromURL( $request->getVal( 'title', '' ) ); + $page = $request->getVal( 'returnto', $page ); $a = array(); if ( strval( $page ) !== '' ) { $a['returnto'] = $page; - $query = $wgRequest->getVal( 'returntoquery', $this->thisquery ); + $query = $request->getVal( 'returntoquery', $this->thisquery ); if( $query != '' ) { $a['returntoquery'] = $query; } @@ -606,20 +561,20 @@ class SkinTemplate extends Skin { ); $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage ); $personal_urls['mytalk'] = array( - 'text' => wfMsg( 'mytalk' ), + 'text' => $this->msg( 'mytalk' )->text(), 'href' => &$usertalkUrlDetails['href'], 'class' => $usertalkUrlDetails['exists'] ? false : 'new', 'active' => ( $usertalkUrlDetails['href'] == $pageurl ) ); $href = self::makeSpecialUrl( 'Preferences' ); $personal_urls['preferences'] = array( - 'text' => wfMsg( 'mypreferences' ), + 'text' => $this->msg( 'mypreferences' )->text(), 'href' => $href, 'active' => ( $href == $pageurl ) ); $href = self::makeSpecialUrl( 'Watchlist' ); $personal_urls['watchlist'] = array( - 'text' => wfMsg( 'mywatchlist' ), + 'text' => $this->msg( 'mywatchlist' )->text(), 'href' => $href, 'active' => ( $href == $pageurl ) ); @@ -627,26 +582,26 @@ class SkinTemplate extends Skin { # We need to do an explicit check for Special:Contributions, as we # have to match both the title, and the target (which could come # from request values or be specified in "sub page" form. The plot - # thickens, because $wgTitle is altered for special pages, so doesn't - # contain the original alias-with-subpage. - $origTitle = Title::newFromText( $wgRequest->getText( 'title' ) ); - if( $origTitle instanceof Title && $origTitle->getNamespace() == NS_SPECIAL ) { + # thickens, because the Title object is altered for special pages, + # so doesn't contain the original alias-with-subpage. + $origTitle = Title::newFromText( $request->getText( 'title' ) ); + if( $origTitle instanceof Title && $origTitle->isSpecialPage() ) { list( $spName, $spPar ) = SpecialPageFactory::resolveAlias( $origTitle->getText() ); $active = $spName == 'Contributions' && ( ( $spPar && $spPar == $this->username ) - || $wgRequest->getText( 'target' ) == $this->username ); + || $request->getText( 'target' ) == $this->username ); } else { $active = false; } $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username ); $personal_urls['mycontris'] = array( - 'text' => wfMsg( 'mycontris' ), + 'text' => $this->msg( 'mycontris' )->text(), 'href' => $href, 'active' => $active ); $personal_urls['logout'] = array( - 'text' => wfMsg( 'userlogout' ), + 'text' => $this->msg( 'userlogout' )->text(), 'href' => self::makeSpecialUrl( 'Userlogout', // userlogout link must always contain an & character, otherwise we might not be able // to detect a buggy precaching proxy (bug 17790) @@ -655,22 +610,21 @@ class SkinTemplate extends Skin { 'active' => false ); } else { - global $wgUser; $useCombinedLoginLink = $this->useCombinedLoginLink(); - $loginlink = $wgUser->isAllowed( 'createaccount' ) && $useCombinedLoginLink + $loginlink = $this->getUser()->isAllowed( 'createaccount' ) && $useCombinedLoginLink ? 'nav-login-createaccount' : 'login'; - $is_signup = $wgRequest->getText('type') == "signup"; + $is_signup = $request->getText('type') == "signup"; # anonlogin & login are the same $login_url = array( - 'text' => wfMsg( $loginlink ), + 'text' => $this->msg( $loginlink )->text(), 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ), 'active' => $title->isSpecial( 'Userlogin' ) && ( $loginlink == "nav-login-createaccount" || !$is_signup ) ); - if ( $wgUser->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) { + if ( $this->getUser()->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) { $createaccount_url = array( - 'text' => wfMsg( 'createaccount' ), + 'text' => $this->msg( 'createaccount' )->text(), 'href' => self::makeSpecialUrl( 'Userlogin', "$returnto&type=signup" ), 'active' => $title->isSpecial( 'Userlogin' ) && $is_signup ); @@ -703,7 +657,7 @@ class SkinTemplate extends Skin { $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage ); $href = &$usertalkUrlDetails['href']; $personal_urls['anontalk'] = array( - 'text' => wfMsg( 'anontalk' ), + 'text' => $this->msg( 'anontalk' )->text(), 'href' => $href, 'class' => $usertalkUrlDetails['exists'] ? false : 'new', 'active' => ( $pageurl == $href ) @@ -743,7 +697,7 @@ class SkinTemplate extends Skin { // wfMessageFallback will nicely accept $message as an array of fallbacks // or just a single key - $msg = wfMessageFallback( $message ); + $msg = wfMessageFallback( $message )->setContext( $this->getContext() ); if ( is_array($message) ) { // for hook compatibility just keep the last message name $message = end($message); @@ -826,8 +780,7 @@ class SkinTemplate extends Skin { * * @return array */ - protected function buildContentNavigationUrls( OutputPage $out ) { - global $wgContLang, $wgLang, $wgUser, $wgRequest; + protected function buildContentNavigationUrls() { global $wgDisableLangConversion; wfProfileIn( __METHOD__ ); @@ -835,6 +788,10 @@ class SkinTemplate extends Skin { $title = $this->getRelevantTitle(); // Display tabs for the relevant title rather than always the title itself $onPage = $title->equals($this->getTitle()); + $out = $this->getOutput(); + $request = $this->getRequest(); + $user = $this->getUser(); + $content_navigation = array( 'namespaces' => array(), 'views' => array(), @@ -843,11 +800,9 @@ class SkinTemplate extends Skin { ); // parameters - $action = $wgRequest->getVal( 'action', 'view' ); - $section = $wgRequest->getVal( 'section' ); + $action = $request->getVal( 'action', 'view' ); - $userCanRead = $title->userCanRead(); - $skname = $this->skinname; + $userCanRead = $title->quickUserCan( 'read', $user ); $preventActiveTabs = false; wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$preventActiveTabs ) ); @@ -870,6 +825,8 @@ class SkinTemplate extends Skin { $talkId = "{$subjectId}_talk"; } + $skname = $this->skinname; + // Adds namespace links $subjectMsg = array( "nstab-$subjectId" ); if ( $subjectPage->isMainPage() ) { @@ -884,163 +841,175 @@ class SkinTemplate extends Skin { ); $content_navigation['namespaces'][$talkId]['context'] = 'talk'; - // Adds view view link - if ( $title->exists() && $userCanRead ) { - $content_navigation['views']['view'] = $this->tabAction( - $isTalk ? $talkPage : $subjectPage, - array( "$skname-view-view", 'view' ), - ( $onPage && ($action == 'view' || $action == 'purge' ) ), '', true - ); - $content_navigation['views']['view']['redundant'] = true; // signal to hide this from simple content_actions - } + if ( $userCanRead ) { + // Adds view view link + if ( $title->exists() ) { + $content_navigation['views']['view'] = $this->tabAction( + $isTalk ? $talkPage : $subjectPage, + array( "$skname-view-view", 'view' ), + ( $onPage && ($action == 'view' || $action == 'purge' ) ), '', true + ); + $content_navigation['views']['view']['redundant'] = true; // signal to hide this from simple content_actions + } - wfProfileIn( __METHOD__ . '-edit' ); - - // Checks if user can... - if ( - // read and edit the current page - $userCanRead && $title->quickUserCan( 'edit' ) && - ( - // if it exists - $title->exists() || - // or they can create one here - $title->quickUserCan( 'create' ) - ) - ) { - // Builds CSS class for talk page links - $isTalkClass = $isTalk ? ' istalk' : ''; - - // Determines if we're in edit mode - $selected = ( - $onPage && - ( $action == 'edit' || $action == 'submit' ) && - ( $section != 'new' ) - ); - $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDefaultMessageText() !== false ) ? - "edit" : "create"; - $content_navigation['views']['edit'] = array( - 'class' => ( $selected ? 'selected' : '' ) . $isTalkClass, - 'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->text(), - 'href' => $title->getLocalURL( $this->editUrlOptions() ), - 'primary' => true, // don't collapse this in vector - ); - // Checks if this is a current rev of talk page and we should show a new - // section link - if ( ( $isTalk && $this->isRevisionCurrent() ) || ( $out->showNewSectionLink() ) ) { - // Checks if we should ever show a new section link - if ( !$out->forceHideNewSectionLink() ) { + wfProfileIn( __METHOD__ . '-edit' ); + + // Checks if user can edit the current page if it exists or create it otherwise + if ( $title->quickUserCan( 'edit', $user ) && ( $title->exists() || $title->quickUserCan( 'create', $user ) ) ) { + // Builds CSS class for talk page links + $isTalkClass = $isTalk ? ' istalk' : ''; + // Whether the user is editing the page + $isEditing = $onPage && ( $action == 'edit' || $action == 'submit' ); + // Whether to show the "Add a new section" tab + // Checks if this is a current rev of talk page and is not forced to be hidden + $showNewSection = !$out->forceHideNewSectionLink() + && ( ( $isTalk && $this->isRevisionCurrent() ) || $out->showNewSectionLink() ); + $section = $request->getVal( 'section' ); + + $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDefaultMessageText() !== false ) ? + "edit" : "create"; + $content_navigation['views']['edit'] = array( + 'class' => ( $isEditing && ( $section !== 'new' || !$showNewSection ) ? 'selected' : '' ) . $isTalkClass, + 'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->setContext( $this->getContext() )->text(), + 'href' => $title->getLocalURL( $this->editUrlOptions() ), + 'primary' => true, // don't collapse this in vector + ); + + // section link + if ( $showNewSection ) { // Adds new section link //$content_navigation['actions']['addsection'] $content_navigation['views']['addsection'] = array( - 'class' => $section == 'new' ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->text(), + 'class' => ( $isEditing && $section == 'new' ) ? 'selected' : false, + 'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->setContext( $this->getContext() )->text(), 'href' => $title->getLocalURL( 'action=edit§ion=new' ) ); } - } - // Checks if the page has some kind of viewable content - } elseif ( $title->hasSourceText() && $userCanRead ) { - // Adds view source view link - $content_navigation['views']['viewsource'] = array( - 'class' => ( $onPage && $action == 'edit' ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->text(), - 'href' => $title->getLocalURL( $this->editUrlOptions() ), - 'primary' => true, // don't collapse this in vector - ); - } - wfProfileOut( __METHOD__ . '-edit' ); - - wfProfileIn( __METHOD__ . '-live' ); - - // Checks if the page exists - if ( $title->exists() && $userCanRead ) { - // Adds history view link - $content_navigation['views']['history'] = array( - 'class' => ( $onPage && $action == 'history' ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->text(), - 'href' => $title->getLocalURL( 'action=history' ), - 'rel' => 'archives', - ); - - if( $wgUser->isAllowed( 'delete' ) ) { - $content_navigation['actions']['delete'] = array( - 'class' => ( $onPage && $action == 'delete' ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->text(), - 'href' => $title->getLocalURL( 'action=delete' ) + // Checks if the page has some kind of viewable content + } elseif ( $title->hasSourceText() ) { + // Adds view source view link + $content_navigation['views']['viewsource'] = array( + 'class' => ( $onPage && $action == 'edit' ) ? 'selected' : false, + 'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->setContext( $this->getContext() )->text(), + 'href' => $title->getLocalURL( $this->editUrlOptions() ), + 'primary' => true, // don't collapse this in vector ); } - if ( $title->quickUserCan( 'move' ) ) { - $moveTitle = SpecialPage::getTitleFor( 'Movepage', $title->getPrefixedDBkey() ); - $content_navigation['actions']['move'] = array( - 'class' => $this->getTitle()->isSpecial( 'Movepage' ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-move", 'move' )->text(), - 'href' => $moveTitle->getLocalURL() + wfProfileOut( __METHOD__ . '-edit' ); + + wfProfileIn( __METHOD__ . '-live' ); + // Checks if the page exists + if ( $title->exists() ) { + // Adds history view link + $content_navigation['views']['history'] = array( + 'class' => ( $onPage && $action == 'history' ) ? 'selected' : false, + 'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->setContext( $this->getContext() )->text(), + 'href' => $title->getLocalURL( 'action=history' ), + 'rel' => 'archives', ); + + if ( $title->quickUserCan( 'delete', $user ) ) { + $content_navigation['actions']['delete'] = array( + 'class' => ( $onPage && $action == 'delete' ) ? 'selected' : false, + 'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->setContext( $this->getContext() )->text(), + 'href' => $title->getLocalURL( 'action=delete' ) + ); + } + + if ( $title->quickUserCan( 'move', $user ) ) { + $moveTitle = SpecialPage::getTitleFor( 'Movepage', $title->getPrefixedDBkey() ); + $content_navigation['actions']['move'] = array( + 'class' => $this->getTitle()->isSpecial( 'Movepage' ) ? 'selected' : false, + 'text' => wfMessageFallback( "$skname-action-move", 'move' )->setContext( $this->getContext() )->text(), + 'href' => $moveTitle->getLocalURL() + ); + } + } else { + // article doesn't exist or is deleted + if ( $user->isAllowed( 'deletedhistory' ) ) { + $n = $title->isDeleted(); + if( $n ) { + $undelTitle = SpecialPage::getTitleFor( 'Undelete' ); + // If the user can't undelete but can view deleted history show them a "View .. deleted" tab instead + $msgKey = $user->isAllowed( 'undelete' ) ? 'undelete' : 'viewdeleted'; + $content_navigation['actions']['undelete'] = array( + 'class' => $this->getTitle()->isSpecial( 'Undelete' ) ? 'selected' : false, + 'text' => wfMessageFallback( "$skname-action-$msgKey", "{$msgKey}_short" ) + ->setContext( $this->getContext() )->numParams( $n )->text(), + 'href' => $undelTitle->getLocalURL( array( 'target' => $title->getPrefixedDBkey() ) ) + ); + } + } } - if ( $title->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) { - $mode = !$title->isProtected() ? 'protect' : 'unprotect'; + if ( $title->getNamespace() !== NS_MEDIAWIKI && $title->quickUserCan( 'protect', $user ) ) { + $mode = $title->isProtected() ? 'unprotect' : 'protect'; $content_navigation['actions'][$mode] = array( 'class' => ( $onPage && $action == $mode ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->text(), + 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->setContext( $this->getContext() )->text(), 'href' => $title->getLocalURL( "action=$mode" ) ); } - } else { - // article doesn't exist or is deleted - if ( $wgUser->isAllowed( 'deletedhistory' ) ) { - $n = $title->isDeleted(); - if( $n ) { - $undelTitle = SpecialPage::getTitleFor( 'Undelete' ); - // If the user can't undelete but can view deleted history show them a "View .. deleted" tab instead - $msgKey = $wgUser->isAllowed( 'undelete' ) ? 'undelete' : 'viewdeleted'; - $content_navigation['actions']['undelete'] = array( - 'class' => $this->getTitle()->isSpecial( 'Undelete' ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-$msgKey", "{$msgKey}_short" ) - ->params( $wgLang->formatNum( $n ) )->text(), - 'href' => $undelTitle->getLocalURL( array( 'target' => $title->getPrefixedDBkey() ) ) - ); - } - } - if ( $title->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) { - $mode = !$title->getRestrictions( 'create' ) ? 'protect' : 'unprotect'; + wfProfileOut( __METHOD__ . '-live' ); + + // Checks if the user is logged in + if ( $this->loggedin ) { + /** + * The following actions use messages which, if made particular to + * the any specific skins, would break the Ajax code which makes this + * action happen entirely inline. Skin::makeGlobalVariablesScript + * defines a set of messages in a javascript object - and these + * messages are assumed to be global for all skins. Without making + * a change to that procedure these messages will have to remain as + * the global versions. + */ + $mode = $title->userIsWatching() ? 'unwatch' : 'watch'; + $token = WatchAction::getWatchToken( $title, $user, $mode ); $content_navigation['actions'][$mode] = array( - 'class' => ( $onPage && $action == $mode ) ? 'selected' : false, - 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->text(), - 'href' => $title->getLocalURL( "action=$mode" ) + 'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false, + 'text' => $this->msg( $mode )->text(), // uses 'watch' or 'unwatch' message + 'href' => $title->getLocalURL( array( 'action' => $mode, 'token' => $token ) ) ); } } - wfProfileOut( __METHOD__ . '-live' ); - - // Checks if the user is logged in - if ( $this->loggedin ) { - /** - * The following actions use messages which, if made particular to - * the any specific skins, would break the Ajax code which makes this - * action happen entirely inline. Skin::makeGlobalVariablesScript - * defines a set of messages in a javascript object - and these - * messages are assumed to be global for all skins. Without making - * a change to that procedure these messages will have to remain as - * the global versions. - */ - $mode = $title->userIsWatching() ? 'unwatch' : 'watch'; - $token = WatchAction::getWatchToken( $title, $wgUser, $mode ); - $content_navigation['actions'][$mode] = array( - 'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false, - 'text' => wfMsg( $mode ), // uses 'watch' or 'unwatch' message - 'href' => $title->getLocalURL( array( 'action' => $mode, 'token' => $token ) ) - ); - } wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$content_navigation ) ); + + if ( $userCanRead && !$wgDisableLangConversion ) { + $pageLang = $title->getPageLanguage(); + // Gets list of language variants + $variants = $pageLang->getVariants(); + // Checks that language conversion is enabled and variants exist + // And if it is not in the special namespace + if( count( $variants ) > 1 ) { + // Gets preferred variant (note that user preference is + // only possible for wiki content language variant) + $preferred = $pageLang->getPreferredVariant(); + // Loops over each variant + foreach( $variants as $code ) { + // Gets variant name from language code + $varname = $pageLang->getVariantname( $code ); + // Checks if the variant is marked as disabled + if( $varname == 'disable' ) { + // Skips this variant + continue; + } + // Appends variant link + $content_navigation['variants'][] = array( + 'class' => ( $code == $preferred ) ? 'selected' : false, + 'text' => $varname, + 'href' => $title->getLocalURL( array( 'variant' => $code ) ) + ); + } + } + } } else { // If it's not content, it's got to be a special page $content_navigation['namespaces']['special'] = array( 'class' => 'selected', - 'text' => wfMsg( 'nstab-special' ), - 'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510 + 'text' => $this->msg( 'nstab-special' )->text(), + 'href' => $request->getRequestURL(), // @bug 2457, 2510 'context' => 'subject' ); @@ -1048,30 +1017,6 @@ class SkinTemplate extends Skin { array( &$this, &$content_navigation ) ); } - // Gets list of language variants - $variants = $wgContLang->getVariants(); - // Checks that language conversion is enabled and variants exist - if( !$wgDisableLangConversion && count( $variants ) > 1 ) { - // Gets preferred variant - $preferred = $wgContLang->getPreferredVariant(); - // Loops over each variant - foreach( $variants as $code ) { - // Gets variant name from language code - $varname = $wgContLang->getVariantname( $code ); - // Checks if the variant is marked as disabled - if( $varname == 'disable' ) { - // Skips this variant - continue; - } - // Appends variant link - $content_navigation['variants'][] = array( - 'class' => ( $code == $preferred ) ? 'selected' : false, - 'text' => $varname, - 'href' => $title->getLocalURL( '', $code ) - ); - } - } - // Equiv to SkinTemplateContentActions wfRunHooks( 'SkinTemplateNavigation::Universal', array( &$this, &$content_navigation ) ); @@ -1168,36 +1113,42 @@ class SkinTemplate extends Skin { * @return array * @private */ - protected function buildNavUrls( OutputPage $out ) { - global $wgUseTrackbacks, $wgUser, $wgRequest; + protected function buildNavUrls() { global $wgUploadNavigationUrl; wfProfileIn( __METHOD__ ); - $action = $wgRequest->getVal( 'action', 'view' ); + $out = $this->getOutput(); + $request = $this->getRequest(); $nav_urls = array(); $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() ); if( $wgUploadNavigationUrl ) { $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl ); - } elseif( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) { + } elseif( UploadBase::isEnabled() && UploadBase::isAllowed( $this->getUser() ) === true ) { $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) ); } else { $nav_urls['upload'] = false; } $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) ); - // default permalink to being off, will override it as required below. + $nav_urls['print'] = false; $nav_urls['permalink'] = false; + $nav_urls['whatlinkshere'] = false; + $nav_urls['recentchangeslinked'] = false; + $nav_urls['contributions'] = false; + $nav_urls['log'] = false; + $nav_urls['blockip'] = false; + $nav_urls['emailuser'] = false; // A print stylesheet is attached to all pages, but nobody ever // figures that out. :) Add a link... - if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) { + if( $out->isArticle() ) { if ( !$out->isPrintable() ) { $nav_urls['print'] = array( - 'text' => wfMsg( 'printableversion' ), + 'text' => $this->msg( 'printableversion' )->text(), 'href' => $this->getTitle()->getLocalURL( - $wgRequest->appendQueryValue( 'printable', 'yes', true ) ) + $request->appendQueryValue( 'printable', 'yes', true ) ) ); } @@ -1205,7 +1156,7 @@ class SkinTemplate extends Skin { $revid = $this->getRevisionId(); if ( $revid ) { $nav_urls['permalink'] = array( - 'text' => wfMsg( 'permalink' ), + 'text' => $this->msg( 'permalink' )->text(), 'href' => $out->getTitle()->getLocalURL( "oldid=$revid" ) ); } @@ -1215,72 +1166,45 @@ class SkinTemplate extends Skin { array( &$this, &$nav_urls, &$revid, &$revid ) ); } - if( $this->getTitle()->getNamespace() != NS_SPECIAL ) { - $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage ); + if ( $out->isArticleRelated() ) { $nav_urls['whatlinkshere'] = array( - 'href' => $wlhTitle->getLocalUrl() + 'href' => SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage )->getLocalUrl() ); - if( $this->getTitle()->getArticleId() ) { - $rclTitle = SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage ); + if ( $this->getTitle()->getArticleId() ) { $nav_urls['recentchangeslinked'] = array( - 'href' => $rclTitle->getLocalUrl() + 'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalUrl() ); - } else { - $nav_urls['recentchangeslinked'] = false; } - if( $wgUseTrackbacks ) - $nav_urls['trackbacklink'] = array( - 'href' => $out->getTitle()->trackbackURL() - ); } $user = $this->getRelevantUser(); if ( $user ) { - $id = $user->getID(); - $ip = $user->isAnon(); $rootUser = $user->getName(); - } else { - $id = 0; - $ip = false; - $rootUser = null; - } - if( $id || $ip ) { # both anons and non-anons have contribs list $nav_urls['contributions'] = array( 'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser ) ); - if( $id ) { + if ( $user->isLoggedIn() ) { $logPage = SpecialPage::getTitleFor( 'Log' ); $nav_urls['log'] = array( - 'href' => $logPage->getLocalUrl( - array( - 'user' => $rootUser - ) - ) + 'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) ) ); - } else { - $nav_urls['log'] = false; } - if ( $wgUser->isAllowed( 'block' ) ) { + if ( $this->getUser()->isAllowed( 'block' ) ) { $nav_urls['blockip'] = array( 'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser ) ); - } else { - $nav_urls['blockip'] = false; } - } else { - $nav_urls['contributions'] = false; - $nav_urls['log'] = false; - $nav_urls['blockip'] = false; - } - $nav_urls['emailuser'] = false; - if( $this->showEmailUser( $id ) ) { - $nav_urls['emailuser'] = array( - 'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser ) - ); + + if ( $this->showEmailUser( $user ) ) { + $nav_urls['emailuser'] = array( + 'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser ) + ); + } } + wfProfileOut( __METHOD__ ); return $nav_urls; } @@ -1294,41 +1218,6 @@ class SkinTemplate extends Skin { return $this->getTitle()->getNamespaceKey(); } - /** - * @private - * @todo FIXME: Why is this duplicated in/from OutputPage::getHeadScripts()?? - */ - function setupUserJs( $allowUserJs ) { - global $wgRequest, $wgJsMimeType; - wfProfileIn( __METHOD__ ); - - $action = $wgRequest->getVal( 'action', 'view' ); - - if( $allowUserJs && $this->loggedin ) { - if( $this->getTitle()->isJsSubpage() and $this->userCanPreview( $action ) ) { - # XXX: additional security check/prompt? - $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText( 'wpTextbox1' ) . ' /*]]>*/'; - } else { - $this->userjs = self::makeUrl( $this->userpage . '/' . $this->skinname . '.js', 'action=raw&ctype=' . $wgJsMimeType ); - } - } - wfProfileOut( __METHOD__ ); - } - - /** - * Code for extensions to hook into to provide per-page CSS, see - * extensions/PageCSS/PageCSS.php for an implementation of this. - * - * @private - */ - function setupPageCss() { - wfProfileIn( __METHOD__ ); - $out = false; - wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) ); - wfProfileOut( __METHOD__ ); - return $out; - } - public function commonPrintStylesheet() { return false; } @@ -1418,12 +1307,10 @@ abstract class QuickTemplate { * @private */ function msgWiki( $str ) { - global $wgParser, $wgOut; + global $wgOut; $text = $this->translator->translate( $str ); - $parserOutput = $wgParser->parse( $text, $wgOut->getTitle(), - $wgOut->parserOptions(), true ); - echo $parserOutput->getText(); + echo $wgOut->parse( $text ); } /** @@ -1461,6 +1348,28 @@ abstract class QuickTemplate { abstract class BaseTemplate extends QuickTemplate { /** + * Get a Message object with its context set + * + * @param $name Str message name + * @return Message + */ + public function getMsg( $name ) { + return $this->getSkin()->msg( $name ); + } + + function msg( $str ) { + echo $this->getMsg( $str )->escaped(); + } + + function msgHtml( $str ) { + echo $this->getMsg( $str )->text(); + } + + function msgWiki( $str ) { + echo $this->getMsg( $str )->parseAsBlock(); + } + + /** * Create an array of common toolbox items from the data in the quicktemplate * stored by SkinTemplate. * The resulting array is built acording to a format intended to be passed @@ -1470,20 +1379,16 @@ abstract class BaseTemplate extends QuickTemplate { wfProfileIn( __METHOD__ ); $toolbox = array(); - if ( $this->data['notspecialpage'] ) { + if ( isset( $this->data['nav_urls']['whatlinkshere'] ) && $this->data['nav_urls']['whatlinkshere'] ) { $toolbox['whatlinkshere'] = $this->data['nav_urls']['whatlinkshere']; $toolbox['whatlinkshere']['id'] = 't-whatlinkshere'; - if ( $this->data['nav_urls']['recentchangeslinked'] ) { - $toolbox['recentchangeslinked'] = $this->data['nav_urls']['recentchangeslinked']; - $toolbox['recentchangeslinked']['msg'] = 'recentchangeslinked-toolbox'; - $toolbox['recentchangeslinked']['id'] = 't-recentchangeslinked'; - } } - if( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) { - $toolbox['trackbacklink'] = $this->data['nav_urls']['trackbacklink']; - $toolbox['trackbacklink']['id'] = 't-trackbacklink'; + if ( isset( $this->data['nav_urls']['recentchangeslinked'] ) && $this->data['nav_urls']['recentchangeslinked'] ) { + $toolbox['recentchangeslinked'] = $this->data['nav_urls']['recentchangeslinked']; + $toolbox['recentchangeslinked']['msg'] = 'recentchangeslinked-toolbox'; + $toolbox['recentchangeslinked']['id'] = 't-recentchangeslinked'; } - if ( $this->data['feeds'] ) { + if ( isset( $this->data['feeds'] ) && $this->data['feeds'] ) { $toolbox['feeds']['id'] = 'feedlinks'; $toolbox['feeds']['links'] = array(); foreach ( $this->data['feeds'] as $key => $feed ) { @@ -1495,17 +1400,17 @@ abstract class BaseTemplate extends QuickTemplate { } } foreach ( array( 'contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages' ) as $special ) { - if ( $this->data['nav_urls'][$special] ) { + if ( isset( $this->data['nav_urls'][$special] ) && $this->data['nav_urls'][$special] ) { $toolbox[$special] = $this->data['nav_urls'][$special]; $toolbox[$special]['id'] = "t-$special"; } } - if ( !empty( $this->data['nav_urls']['print']['href'] ) ) { + if ( isset( $this->data['nav_urls']['print'] ) && $this->data['nav_urls']['print'] ) { $toolbox['print'] = $this->data['nav_urls']['print']; $toolbox['print']['rel'] = 'alternate'; $toolbox['print']['msg'] = 'printableversion'; } - if( $this->data['nav_urls']['permalink'] ) { + if ( isset( $this->data['nav_urls']['permalink'] ) && $this->data['nav_urls']['permalink'] ) { $toolbox['permalink'] = $this->data['nav_urls']['permalink']; if( $toolbox['permalink']['href'] === '' ) { unset( $toolbox['permalink']['href'] ); @@ -1583,13 +1488,13 @@ abstract class BaseTemplate extends QuickTemplate { // Search is a special case, skins should custom implement this $boxes[$boxName] = array( 'id' => "p-search", - 'header' => wfMessage( 'search' )->text(), + 'header' => $this->getMsg( 'search' )->text(), 'generated' => false, 'content' => true, ); break; case 'TOOLBOX': - $msgObj = wfMessage( 'toolbox' ); + $msgObj = $this->getMsg( 'toolbox' ); $boxes[$boxName] = array( 'id' => "p-tb", 'header' => $msgObj->exists() ? $msgObj->text() : 'toolbox', @@ -1599,7 +1504,7 @@ abstract class BaseTemplate extends QuickTemplate { break; case 'LANGUAGES': if ( $this->data['language_urls'] ) { - $msgObj = wfMessage( 'otherlanguages' ); + $msgObj = $this->getMsg( 'otherlanguages' ); $boxes[$boxName] = array( 'id' => "p-lang", 'header' => $msgObj->exists() ? $msgObj->text() : 'otherlanguages', @@ -1609,7 +1514,7 @@ abstract class BaseTemplate extends QuickTemplate { } break; default: - $msgObj = wfMessage( $boxName ); + $msgObj = $this->getMsg( $boxName ); $boxes[$boxName] = array( 'id' => "p-$boxName", 'header' => $msgObj->exists() ? $msgObj->text() : $boxName, |