Use $this->getLang() per Nikerabbit on r91648.

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

diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php
index e5202bb..3b5d843 100644 (file)
--- a/includes/SkinLegacy.php
+++ b/includes/SkinLegacy.php
@@ -9,6 +9,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 class SkinLegacy extends SkinTemplate {
        var $useHeadElement = true;
+       protected $mWatchLinkNum = 0; // Appended to end of watch link id's
 
        /**
         * Add skin specific stylesheets
@@ -53,6 +54,12 @@ class SkinLegacy extends SkinTemplate {
                        return 0;
                }
                $q = $wgUser->getOption( 'quickbar', 0 );
+               if( $q == 5 ) {
+                       # 5 is the default, which chooses the setting
+                       # depending on the directionality of your interface language
+                       global $wgLang;
+                       return $wgLang->isRTL() ? 2 : 1;
+               }
                return $q;
        }
 
@@ -67,6 +74,10 @@ class LegacyTemplate extends BaseTemplate {
                $this->html( 'headelement' );
                echo $this->beforeContent();
                $this->html( 'bodytext' );
+               echo '<div class="printfooter">';
+               $this->html( 'printfooter' );
+               echo '</div>';
+               $this->html( 'debughtml' );
                echo "\n";
                echo $this->afterContent();
                $this->html( 'dataAfterContent' );
@@ -432,7 +443,7 @@ class LegacyTemplate extends BaseTemplate {
        function specialPagesList() {
                global $wgContLang, $wgServer, $wgRedirectScript;
 
-               $pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
+               $pages = SpecialPageFactory::getUsablePages();
 
                foreach ( $pages as $name => $page ) {
                        $pages[$name] = $page->getDescription();
@@ -667,22 +678,31 @@ class LegacyTemplate extends BaseTemplate {
        }
 
        function watchThisPage() {
-               global $wgOut;
+               global $wgOut, $wgUser;
                ++$this->mWatchLinkNum;
 
+               // Cache
+               $title = $this->getSkin()->getTitle();
+
                if ( $wgOut->isArticleRelated() ) {
-                       if ( $this->getSkin()->getTitle()->userIsWatching() ) {
+                       if ( $title->userIsWatching() ) {
                                $text = wfMsg( 'unwatchthispage' );
-                               $query = array( 'action' => 'unwatch' );
+                               $query = array(
+                                       'action' => 'unwatch',
+                                       'token' => UnwatchAction::getUnwatchToken( $title, $wgUser ),
+                               );
                                $id = 'mw-unwatch-link' . $this->mWatchLinkNum;
                        } else {
                                $text = wfMsg( 'watchthispage' );
-                               $query = array( 'action' => 'watch' );
+                               $query = array(
+                                       'action' => 'watch',
+                                       'token' => WatchAction::getWatchToken( $title, $wgUser ),
+                               );
                                $id = 'mw-watch-link' . $this->mWatchLinkNum;
                        }
 
                        $s = $this->getSkin()->link(
-                               $this->getSkin()->getTitle(),
+                               $title,
                                $text,
                                array( 'id' => $id ),
                                $query,