Followup r85227. Convert all IncludableSpecialPages to use context properly (they...

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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 4f60d55..7a91b37 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -154,7 +154,6 @@ class SkinTemplate extends Skin {
                wfProfileIn( __METHOD__ . '-init' );
                $this->initPage( $out );
 
-               $this->setMembers();
                $tpl = $this->setupTemplate( $this->template, 'skins' );
                wfProfileOut( __METHOD__ . '-init' );
 
@@ -248,7 +247,7 @@ class SkinTemplate extends Skin {
                $tpl->set( 'isarticle', $out->isArticle() );
 
                $tpl->setRef( 'thispage', $this->thispage );
-               $subpagestr = $this->subPageSubtitle();
+               $subpagestr = $this->subPageSubtitle( $out );
                $tpl->set(
                        'subtitle', !empty( $subpagestr ) ?
                        '<span class="subpages">' . $subpagestr . '</span>' . $out->getSubtitle() :
@@ -261,7 +260,7 @@ class SkinTemplate extends Skin {
                        ''
                );
 
-               $tpl->set( 'catlinks', $this->getCategories() );
+               $tpl->set( 'catlinks', $this->getCategories( $out ) );
                if( $out->isSyndicated() ) {
                        $feeds = array();
                        foreach( $out->getSyndicationLinks() as $format => $link ) {
@@ -334,7 +333,7 @@ class SkinTemplate extends Skin {
                        }
                }
 
-               $newtalks = $this->getNewtalks();
+               $newtalks = $this->getNewtalks( $out );
 
                wfProfileOut( __METHOD__ . '-stuff2' );
 
@@ -399,7 +398,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set( 'copyright', false );
                        $tpl->set( 'viewcount', false );
-                       $tpl->set( 'lastmod', false );
+                       $tpl->set( 'lastmod', false ); 
                        $tpl->set( 'credits', false );
                        $tpl->set( 'numberofwatchingusers', false );
                }
@@ -456,13 +455,14 @@ class SkinTemplate extends Skin {
                $tpl->set( 'sitenotice', $this->getSiteNotice() );
                $tpl->set( 'bottomscripts', $this->bottomScripts( $out ) );
 
+               // @todo Give printfooter userlangattributes
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
                global $wgBetterDirectionality;
                if ( $wgBetterDirectionality ) {
                        $realBodyAttribs = array( 'lang' => $wgLanguageCode, 'dir' => $wgContLang->getDir() );
                        $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
                }
-               $out->mBodytext .= $printfooter . $this->generateDebugHTML();
+               $out->mBodytext .= $printfooter . $this->generateDebugHTML( $out );
                $tpl->setRef( 'bodytext', $out->mBodytext );
 
                # Language links
@@ -682,12 +682,12 @@ class SkinTemplate extends Skin {
                                        'active' => ( $pageurl == $href )
                                );
                                $personal_urls['anonlogin'] = $login_url;
-                               if ( isset($createaccount_url) ) {
-                                       $personal_urls['createaccount'] = $createaccount_url;
-                               }
                        } else {
                                $personal_urls['login'] = $login_url;
                        }
+                       if ( isset($createaccount_url) ) {
+                               $personal_urls['createaccount'] = $createaccount_url;
+                       }
                }
 
                wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
@@ -1223,7 +1223,7 @@ class SkinTemplate extends Skin {
 
                        if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $rootUser )
+                                       'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser )
                                );
                        } else {
                                $nav_urls['blockip'] = false;
@@ -1713,7 +1713,7 @@ abstract class BaseTemplate extends QuickTemplate {
 
                if ( $option == 'icononly' ) {
                        // Unset any icons which don't have an image
-                       foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) {
+                       foreach ( $footericons as &$footerIconsBlock ) {
                                foreach ( $footerIconsBlock as $footerIconKey => $footerIcon ) {
                                        if ( !is_string( $footerIcon ) && !isset( $footerIcon['src'] ) ) {
                                                unset( $footerIconsBlock[$footerIconKey] );