Merge "registration: Use the correct key for skin dependencies"

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

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 507688d..7b2d79e 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -206,7 +206,7 @@ class SkinTemplate extends Skin {
        /**
         * initialize various variables and generate the template
         *
-        * @param OutputPage $out
+        * @param OutputPage|null $out
         */
        function outputPage( OutputPage $out = null ) {
                Profiler::instance()->setTemplated( true );
@@ -508,7 +508,7 @@ class SkinTemplate extends Skin {
         *
         * @since 1.31
         *
-        * @param array $personalTools
+        * @param array|null $personalTools
         * @param array $options
         * @return string
         */
@@ -1116,11 +1116,11 @@ class SkinTemplate extends Skin {
 
                        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 ) {
+                               if ( $pageLang->hasVariants() ) {
+                                       // Gets list of language variants
+                                       $variants = $pageLang->getVariants();
                                        // Gets preferred variant (note that user preference is
                                        // only possible for wiki content language variant)
                                        $preferred = $pageLang->getPreferredVariant();