Fix per Krinkle's CR r97329: "There is and should be only one kind of #filetoc. Speci...

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

diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index 6e8febc..21d3578 100644 (file)
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -54,10 +54,7 @@ class NostalgiaTemplate extends LegacyTemplate {
                        $s .= '<br />' . $ol;
                }
 
-               $cat = '<div id="catlinks" class="catlinks">' . $this->getSkin()->getCategoryLinks() . '</div>';
-               if( $cat ) {
-                       $s .= '<br />' . $cat;
-               }
+               $s .= $this->getSkin()->getCategories();
 
                $s .= "<br clear='all' /></div><hr />\n</div>\n";
                $s .= "\n<div id='article'>";
@@ -86,9 +83,10 @@ class NostalgiaTemplate extends LegacyTemplate {
                        $s .= $sep . Linker::specialLink( 'Userlogin' );
                } else {
                        /* show user page and user talk links */
-                       $s .= $sep . Linker::link( $this->getSkin()->getUser()->getUserPage(), wfMsgHtml( 'mypage' ) );
-                       $s .= $sep . Linker::link( $this->getSkin()->getUser()->getTalkPage(), wfMsgHtml( 'mytalk' ) );
-                       if ( $this->getSkin()->getUser()->getNewtalk() ) {
+                       $user = $this->getSkin()->getUser();
+                       $s .= $sep . Linker::link( $user->getUserPage(), wfMsgHtml( 'mypage' ) );
+                       $s .= $sep . Linker::link( $user->getTalkPage(), wfMsgHtml( 'mytalk' ) );
+                       if ( $user->getNewtalk() ) {
                                $s .= ' *';
                        }
                        /* show watchlist link */
@@ -100,12 +98,12 @@ class NostalgiaTemplate extends LegacyTemplate {
                        /* show my preferences link */
                        $s .= $sep . Linker::specialLink( 'Preferences' );
                        /* show upload file link */
-                       if( UploadBase::isEnabled() && UploadBase::isAllowed( $this->getSkin()->getUser() ) === true ) {
+                       if( UploadBase::isEnabled() && UploadBase::isAllowed( $user ) === true ) {
                                $s .= $sep . $this->getUploadLink();
                        }
 
                        /* show log out link */
-                       $s .= $sep . $this->getSkin()->specialLink( 'Userlogout' );
+                       $s .= $sep . Linker::specialLink( 'Userlogout' );
                }
 
                $s .= $sep . $this->specialPagesList();