Marked canChangePassword protected, w/s fixes

[lhc/web/wiklou.git] / skins / Vector.php

diff --git a/skins/Vector.php b/skins/Vector.php
index 8f25d99..e0d87a8 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -29,7 +29,7 @@ class SkinVector extends SkinTemplate {
                global $wgLocalStylePath, $wgRequest;
 
                parent::initPage( $out );
-               
+
                // Append CSS which includes IE only behavior fixes for hover support -
                // this is better than including this in a CSS fille since it doesn't
                // wait for the CSS file to load before fetching the HTC file.
@@ -39,7 +39,7 @@ class SkinVector extends SkinTemplate {
                                htmlspecialchars( $wgLocalStylePath ) .
                                "/{$this->stylename}/csshover{$min}.htc\")}</style><![endif]-->"
                );
-               
+
                $out->addModuleScripts( 'skins.vector' );
        }
 
@@ -80,7 +80,7 @@ class VectorTemplate extends BaseTemplate {
                // Build additional attributes for navigation urls
                //$nav = $this->skin->buildNavigationUrls();
                $nav = $this->data['content_navigation'];
-               
+
                if ( $wgVectorUseIconWatch ) {
                        $mode = $this->skin->getTitle()->userIsWatching() ? 'unwatch' : 'watch';
                        if ( isset( $nav['actions'][$mode] ) ) {
@@ -97,7 +97,7 @@ class VectorTemplate extends BaseTemplate {
                                if ( $section == 'views' && !( isset( $link['primary'] ) && $link['primary'] ) ) {
                                        $link['class'] = rtrim( 'collapsible ' . $link['class'], ' ' );
                                }
-                               
+
                                $xmlID = isset( $link['id'] ) ? $link['id'] : 'ca-' . $xmlID;
                                $nav[$section][$key]['attributes'] =
                                        ' id="' . Sanitizer::escapeId( $xmlID ) . '"';
@@ -135,7 +135,7 @@ class VectorTemplate extends BaseTemplate {
                <div id="mw-page-base" class="noprint"></div>
                <div id="mw-head-base" class="noprint"></div>
                <!-- content -->
-               <div id="content"<?php $this->html( 'specialpageattributes' ) ?>>
+               <div id="content">
                        <a id="top"></a>
                        <div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
                        <?php if ( $this->data['sitenotice'] ): ?>
@@ -259,7 +259,7 @@ class VectorTemplate extends BaseTemplate {
        /**
         * Render a series of portals
         *
-        * @params $portals array
+        * @param $portals array
         */
        private function renderPortals( $portals ) {
                // Force the rendering of the following portals
@@ -336,14 +336,14 @@ class VectorTemplate extends BaseTemplate {
         * @param $elements array
         */
        private function renderNavigation( $elements ) {
-               global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser;
+               global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang;
 
                // If only one element was given, wrap it in an array, allowing more
                // flexible arguments
                if ( !is_array( $elements ) ) {
                        $elements = array( $elements );
                // If there's a series of elements, reverse them when in RTL mode
-               } elseif ( wfUILang()->isRTL() ) {
+               } elseif ( $wgLang->isRTL() ) {
                        $elements = array_reverse( $elements );
                }
                // Render elements