We don't need $skin as a local variable.

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

diff --git a/skins/Standard.php b/skins/Standard.php
index a8f304f..ff1e933 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -18,6 +18,9 @@ class SkinStandard extends SkinLegacy {
        var $skinname = 'standard', $stylename = 'standard',
                $template = 'StandardTemplate';
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->AddModuleStyles( 'skins.standard' );
@@ -51,6 +54,9 @@ class SkinStandard extends SkinLegacy {
 
 class StandardTemplate extends LegacyTemplate {
 
+       /**
+        * @return string
+        */
        function doAfterContent() {
                global $wgContLang, $wgLang;
                wfProfileIn( __METHOD__ );
@@ -79,7 +85,7 @@ class StandardTemplate extends LegacyTemplate {
                $s .= "\n<br />" . $wgLang->pipeList( array(
                        $this->getSkin()->mainPageLink(),
                        $this->getSkin()->aboutLink(),
-                       $this->getSkin()->specialLink( 'Recentchanges' ),
+                       Linker::specialLink( 'Recentchanges' ),
                        $this->searchForm() ) )
                        . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
 
@@ -99,6 +105,9 @@ class StandardTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function quickBar() {
                global $wgOut, $wgUser, $wgRequest, $wgContLang;
 
@@ -120,7 +129,7 @@ class StandardTemplate extends LegacyTemplate {
                unset( $bar['TOOLBOX'] );
 
                $barnumber = 1;
-               foreach ( $bar as $heading => $browseLinks ) {
+               foreach ( $bar as $browseLinks ) {
                        if ( $barnumber > 1 ) {
                                $s .= "\n<hr class='sep' />";
                        } 
@@ -133,8 +142,8 @@ class StandardTemplate extends LegacyTemplate {
                        if ( $barnumber == 1 ) {
                                // only show watchlist link if logged in
                                if( $wgUser->isLoggedIn() ) {
-                                       $s.= $this->getSkin()->specialLink( 'Watchlist' ) ;
-                                       $s .= $sep . $this->getSkin()->linkKnown(
+                                       $s.= Linker::specialLink( 'Watchlist' ) ;
+                                       $s .= $sep . Linker::linkKnown(
                                                SpecialPage::getTitleFor( 'Contributions' ),
                                                wfMsg( 'mycontris' ),
                                                array(),
@@ -197,10 +206,7 @@ class StandardTemplate extends LegacyTemplate {
                                                $link = $nstext . ':' . $link;
                                        }
 
-                                       $s .= $this->getSkin()->link(
-                                               Title::newFromText( $link ),
-                                               $text
-                                       );
+                                       $s .= Linker::link( Title::newFromText( $link ), $text );
                                } elseif( $this->getSkin()->getTitle()->getNamespace() != NS_SPECIAL ) {
                                        # we just throw in a "New page" text to tell the user that he's in edit mode,
                                        # and to avoid messing with the separator that is prepended to the next item
@@ -259,7 +265,7 @@ class StandardTemplate extends LegacyTemplate {
                                if( $id || $ip ){
                                        $s .= $sep . $this->userContribsLink();
                                }
-                               if( $this->showEmailUser( $id ) ) {
+                               if( $this->getSkin()->showEmailUser( $id ) ) {
                                        $s .= $sep . $this->emailUserLink();
                                }
                        }
@@ -270,7 +276,7 @@ class StandardTemplate extends LegacyTemplate {
                        $s .= $this->getUploadLink() . $sep;
                }
 
-               $s .= $this->getSkin()->specialLink( 'Specialpages' );
+               $s .= Linker::specialLink( 'Specialpages' );
 
                global $wgSiteSupportPage;
                if( $wgSiteSupportPage ) {