Revert r73887. I blame Nikerabbit!

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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 02df836..8425333 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -107,9 +107,7 @@ class SkinTemplate extends Skin {
         * @param $out OutputPage
         */
        function setupSkinUserCss( OutputPage $out ){
-               $out->addModuleStyles( 'mediawiki.legacy.shared' );
-               // ResourceLoader does not support CSS media types yet, so we must include this on it's own the old way
-               $out->addStyle( 'common/commonPrint.css', 'print' );
+               $out->addModuleStyles( array( 'mediawiki.legacy.shared', 'mediawiki.legacy.commonPrint' ) );
        }
 
        /**
@@ -219,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() ) {
@@ -661,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,
                );
        }
 
@@ -671,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,
                );
        }