Revert r73887. I blame Nikerabbit!

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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index b1ea8f6..8425333 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1,22 +1,28 @@
 <?php
+/**
+ * Base class for template-based skins
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
 if ( ! defined( 'MEDIAWIKI' ) )
        die( 1 );
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
 /**
  * Wrapper object for MediaWiki's localization functions,
  * to be passed to the template engine.
@@ -101,8 +107,7 @@ class SkinTemplate extends Skin {
         * @param $out OutputPage
         */
        function setupSkinUserCss( OutputPage $out ){
-               $out->addStyle( 'common/shared.css', 'screen' );
-               $out->addStyle( 'common/commonPrint.css', 'print' );
+               $out->addModuleStyles( array( 'mediawiki.legacy.shared', 'mediawiki.legacy.commonPrint' ) );
        }
 
        /**
@@ -127,7 +132,7 @@ class SkinTemplate extends Skin {
         */
        function outputPage( OutputPage $out ) {
                global $wgArticle, $wgUser, $wgLang, $wgContLang;
-               global $wgScript, $wgStylePath, $wgContLanguageCode;
+               global $wgScript, $wgStylePath, $wgLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
                global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version;
                global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
@@ -212,7 +217,7 @@ class SkinTemplate extends Skin {
                        $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
                        $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
                        $tpl->set( 'html5version', $wgHtml5Version );
-                       $tpl->set( 'headlinks', $out->getHeadLinks() );
+                       $tpl->set( 'headlinks', $out->getHeadLinks( $this->getSkinName() ) );
                        $tpl->set( 'csslinks', $out->buildCssLinks() );
 
                        if( $wgUseTrackbacks && $out->isArticleRelated() ) {
@@ -415,12 +420,12 @@ class SkinTemplate extends Skin {
 
                $tpl->set( 'reporttime', wfReportTime() );
                $tpl->set( 'sitenotice', wfGetSiteNotice() );
-               $tpl->set( 'bottomscripts', $this->bottomScripts() );
+               $tpl->set( 'bottomscripts', $this->bottomScripts( $out ) );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
                global $wgBetterDirectionality;
                if ( $wgBetterDirectionality ) {
-                       $realBodyAttribs = array( 'lang' => $wgContLanguageCode, 'dir' => $wgContLang->getDir() );
+                       $realBodyAttribs = array( 'lang' => $wgLanguageCode, 'dir' => $wgContLang->getDir() );
                        $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
                }
                $out->mBodytext .= $printfooter . $this->generateDebugHTML();
@@ -654,7 +659,7 @@ class SkinTemplate extends Skin {
                self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 
@@ -664,7 +669,7 @@ class SkinTemplate extends Skin {
                self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 
@@ -875,7 +880,7 @@ class SkinTemplate extends Skin {
         */
        function buildNavUrls() {
                global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
-               global $wgEnableUploads, $wgUploadNavigationUrl;
+               global $wgUploadNavigationUrl;
 
                wfProfileIn( __METHOD__ );