Merge "TitleOptionWidget: Documentation type fix"

[lhc/web/wiklou.git] / includes / skins / SkinTemplate.php

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 8b46ee9..af7ec29 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -62,12 +62,10 @@ class SkinTemplate extends Skin {
         * roughly equivalent to PHPTAL 0.7.
         *
         * @param string $classname
-        * @param bool|string $repository Subdirectory where we keep template files
-        * @param bool|string $cache_dir
         * @return QuickTemplate
         * @private
         */
-       function setupTemplate( $classname, $repository = false, $cache_dir = false ) {
+       function setupTemplate( $classname ) {
                return new $classname( $this->getConfig() );
        }
 
@@ -179,7 +177,7 @@ class SkinTemplate extends Skin {
                $user = $this->getUser();
                $title = $this->getTitle();
 
-               $tpl = $this->setupTemplate( $this->template, 'skins' );
+               $tpl = $this->setupTemplate( $this->template );
 
                $this->thispage = $title->getPrefixedDBkey();
                $this->titletxt = $title->getPrefixedText();
@@ -256,7 +254,7 @@ class SkinTemplate extends Skin {
         * @return QuickTemplate The template to be executed by outputPage
         */
        protected function prepareQuickTemplate() {
-               global $wgScript, $wgStylePath, $wgMimeType, $wgJsMimeType,
+               global $wgScript, $wgStylePath, $wgMimeType,
                        $wgSitename, $wgLogo, $wgMaxCredits,
                        $wgShowCreditsIfMax, $wgArticlePath,
                        $wgScriptPath, $wgServer;
@@ -306,7 +304,6 @@ class SkinTemplate extends Skin {
                }
 
                $tpl->set( 'mimetype', $wgMimeType );
-               $tpl->set( 'jsmimetype', $wgJsMimeType );
                $tpl->set( 'charset', 'UTF-8' );
                $tpl->set( 'wgScript', $wgScript );
                $tpl->set( 'skinname', $this->skinname );
@@ -317,7 +314,7 @@ class SkinTemplate extends Skin {
                $tpl->set( 'handheld', $request->getBool( 'handheld' ) );
                $tpl->set( 'loggedin', $this->loggedin );
                $tpl->set( 'notspecialpage', !$title->isSpecialPage() );
-               $tpl->set( 'searchaction', $this->escapeSearchLink() );
+               $tpl->set( 'searchaction', $this->getSearchLink() );
                $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey() );
                $tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
                $tpl->set( 'stylepath', $wgStylePath );
@@ -1278,6 +1275,7 @@ class SkinTemplate extends Skin {
                $nav_urls['contributions'] = false;
                $nav_urls['log'] = false;
                $nav_urls['blockip'] = false;
+               $nav_urls['mute'] = false;
                $nav_urls['emailuser'] = false;
                $nav_urls['userrights'] = false;
 
@@ -1355,6 +1353,13 @@ class SkinTemplate extends Skin {
                        }
 
                        if ( !$user->isAnon() ) {
+                               if ( $this->getUser()->isRegistered() && $this->getConfig()->get( 'EnableSpecialMute' ) ) {
+                                       $nav_urls['mute'] = [
+                                               'text' => $this->msg( 'mute-preferences' )->text(),
+                                               'href' => self::makeSpecialUrlSubpage( 'Mute', $rootUser )
+                                       ];
+                               }
+
                                $sur = new UserrightsPage;
                                $sur->setContext( $this->getContext() );
                                $canChange = $sur->userCanChangeRights( $user );