Remove unused parameter, update callers

Trim whitespace

diff --git a/skins/Modern.php b/skins/Modern.php
index 9b85064..d0646c6 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -63,7 +63,7 @@ class ModernTemplate extends MonoBookTemplate {
        <div id="mw_main">
        <div id="mw_contentwrapper">
        <!-- navigation portlet -->
-<?php $this->cactions( $skin ); ?>
+<?php $this->cactions(); ?>
 
        <!-- content -->
        <div id="mw_content">

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index be6f495..76a21ef 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -31,13 +31,13 @@ class SkinMonoBook extends SkinTemplate {
                parent::setupSkinUserCss( $out );
 
                $out->addModuleStyles( 'skins.monobook' );
-               
+
                // Ugh. Can't do this properly because $wgHandheldStyle may be a URL
                if( $wgHandheldStyle ) {
                        // Currently in testing... try 'chick/main.css'
                        $out->addStyle( $wgHandheldStyle, 'handheld' );
                }
-               
+
                // TODO: Migrate all of these
                //$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
                //$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' );
@@ -103,7 +103,7 @@ class MonoBookTemplate extends BaseTemplate {
        </div>
 </div></div>
 <div id="column-one"<?php $this->html('userlangattributes')  ?>>
-<?php $this->cactions( $this->skin ); ?>
+<?php $this->cactions(); ?>
        <div class="portlet" id="p-personal">
                <h5><?php $this->msg('personaltools') ?></h5>
                <div class="pBody">
@@ -225,7 +225,7 @@ echo $footerEnd;
         *
         * @param $skin Skin
         */
-       function cactions( Skin $skin ) {
+       function cactions() {
 ?>
        <div id="p-cactions" class="portlet">
                <h5><?php $this->msg('views') ?></h5>
@@ -233,7 +233,7 @@ echo $footerEnd;
                        <ul><?php
                                foreach($this->data['content_actions'] as $key => $tab) {
                                        $linkAttribs = array( 'href' => $tab['href'] );
-                                       
+
                                        if( isset( $tab["tooltiponly"] ) && $tab["tooltiponly"] ) {
                                                $title = Linker::titleAttrib( "ca-$key" );
                                                if ( $title !== false ) {
@@ -243,7 +243,7 @@ echo $footerEnd;
                                                $linkAttribs += Linker::tooltipAndAccesskeyAttribs( "ca-$key" );
                                        }
                                        $linkHtml = Html::element( 'a', $linkAttribs, $tab['text'] );
-                                       
+
                                        /* Surround with a <li> */
                                        $liAttribs = array( 'id' => Sanitizer::escapeId( "ca-$key" ) );
                                        if( $tab['class'] ) {

diff --git a/skins/Vector.php b/skins/Vector.php
index 8f25d99..c4def54 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 ) . '"';
@@ -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