Special:Listinterwikis

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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index ca3546d..ac020b7 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -203,8 +203,10 @@ class SkinTemplate extends Skin {
                $tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() );
                $tpl->set( 'titletext', $this->mTitle->getText() );
                $tpl->set( 'articleid', $this->mTitle->getArticleId() );
+               $tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
+
                $tpl->set( 'isarticle', $wgOut->isArticle() );
-                               
+
                $tpl->setRef( "thispage", $this->thispage );
                $subpagestr = $this->subPageSubtitle();
                $tpl->set(
@@ -515,7 +517,7 @@ class SkinTemplate extends Skin {
                                'href' => $href,
                                'active' => ( $href == $pageurl )
                        );
-                       $href = self::makeSpecialUrl( "Contributions/$this->username" );
+                       $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username );
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg( 'mycontris' ),
                                'href' => $href,
@@ -810,7 +812,7 @@ class SkinTemplate extends Skin {
                $oldid = $wgRequest->getVal( 'oldid' );
 
                $nav_urls = array();
-               $nav_urls['mainpage'] = array( 'href' => self::makeI18nUrl( 'mainpage') );
+               $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
                if( $wgEnableUploads ) {
                        if ($wgUploadNavigationUrl) {
                                $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
@@ -884,11 +886,11 @@ class SkinTemplate extends Skin {
 
                if($id || $ip) { # both anons and non-anons have contri list
                        $nav_urls['contributions'] = array(
-                               'href' => self::makeSpecialUrl( 'Contributions/' . $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
                        );
                        if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrl( 'Blockip/' . $this->mTitle->getText() )
+                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
                                ); 
                        } else {
                                $nav_urls['blockip'] = false;
@@ -900,7 +902,7 @@ class SkinTemplate extends Skin {
                $nav_urls['emailuser'] = false;
                if( $this->showEmailUser( $id ) ) {
                        $nav_urls['emailuser'] = array(
-                               'href' => self::makeSpecialUrl( 'Emailuser/' . $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
                        );
                }
                wfProfileOut( $fname );