call JS onload hooks at the end of the html body in all skins
[lhc/web/wiklou.git] / includes / Skin.php
index 7c850c3..a99ff0a 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+       die( 1 );
 
 /**
  *
@@ -6,63 +8,16 @@
  * @subpackage Skins
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
- */
-if( defined( "MEDIAWIKI" ) ) {
-
 # See skin.txt
-require_once( 'Linker.php' );
-require_once( 'Image.php' );
-
-# Get a list of all skins available in /skins/
-# Build using the regular expression '^(.*).php$'
-# Array keys are all lower case, array value keep the case used by filename
-#
-
-$skinDir = dir($IP.'/skins');
-
-# while code from www.php.net
-while (false !== ($file = $skinDir->read())) {
-       if(preg_match('/^([^.].*)\.php$/',$file, $matches)) {
-               $aSkin = $matches[1];
-               $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
-       }
-}
-$skinDir->close();
-unset($matches);
-
-require_once( 'RecentChange.php' );
-
-/**
- * @todo document
- * @package MediaWiki
- */
-class RCCacheEntry extends RecentChange
-{
-       var $secureName, $link;
-       var $curlink , $difflink, $lastlink , $usertalklink , $versionlink ;
-       var $userlink, $timestamp, $watched;
-
-       function newFromParent( $rc )
-       {
-               $rc2 = new RCCacheEntry;
-               $rc2->mAttribs = $rc->mAttribs;
-               $rc2->mExtra = $rc->mExtra;
-               return $rc2;
-       }
-} ;
-
 
 /**
- * The main skin class that provide methods and properties for all other skins
- * including PHPTal skins.
+ * The main skin class that provide methods and properties for all other skins.
  * This base class is also the "Standard" skin.
  * @package MediaWiki
  */
 class Skin extends Linker {
        /**#@+
-        * @access private
+        * @private
         */
        var $lastdate, $lastline;
        var $rc_cache ; # Cache for Enhanced Recent Changes
@@ -73,13 +28,119 @@ class Skin extends Linker {
        /** Constructor, call parent constructor */
        function Skin() { parent::Linker(); }
 
-       function getSkinNames() {
+       /**
+        * Fetch the set of available skins.
+        * @return array of strings
+        * @static
+        */
+       static function &getSkinNames() {
                global $wgValidSkinNames;
+               static $skinsInitialised = false;
+               if ( !$skinsInitialised ) {
+                       # Get a list of available skins
+                       # Build using the regular expression '^(.*).php$'
+                       # Array keys are all lower case, array value keep the case used by filename
+                       #
+                       wfProfileIn( __METHOD__ . '-init' );
+                       global $wgStyleDirectory;
+                       $skinDir = dir( $wgStyleDirectory );
+
+                       # while code from www.php.net
+                       while (false !== ($file = $skinDir->read())) {
+                               // Skip non-PHP files, hidden files, and '.dep' includes
+                               if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
+                                       $aSkin = $matches[1];
+                                       $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
+                               }
+                       }
+                       $skinDir->close();
+                       $skinsInitialised = true;
+                       wfProfileOut( __METHOD__ . '-init' );
+               }
                return $wgValidSkinNames;
        }
 
+       /**
+        * Normalize a skin preference value to a form that can be loaded.
+        * If a skin can't be found, it will fall back to the configured
+        * default (or the old 'Classic' skin if that's broken).
+        * @param string $key
+        * @return string
+        * @static
+        */
+       static function normalizeKey( $key ) {
+               global $wgDefaultSkin;
+               $skinNames = Skin::getSkinNames();
+
+               if( $key == '' ) {
+                       // Don't return the default immediately;
+                       // in a misconfiguration we need to fall back.
+                       $key = $wgDefaultSkin;
+               }
+
+               if( isset( $skinNames[$key] ) ) {
+                       return $key;
+               }
+
+               // Older versions of the software used a numeric setting
+               // in the user preferences.
+               $fallback = array(
+                       0 => $wgDefaultSkin,
+                       1 => 'nostalgia',
+                       2 => 'cologneblue' );
+
+               if( isset( $fallback[$key] ) ){
+                       $key = $fallback[$key];
+               }
+
+               if( isset( $skinNames[$key] ) ) {
+                       return $key;
+               } else {
+                       // The old built-in skin
+                       return 'standard';
+               }
+       }
+
+       /**
+        * Factory method for loading a skin of a given type
+        * @param string $key 'monobook', 'standard', etc
+        * @return Skin
+        * @static
+        */
+       static function &newFromKey( $key ) {
+               global $wgStyleDirectory;
+               
+               $key = Skin::normalizeKey( $key );
+
+               $skinNames = Skin::getSkinNames();
+               $skinName = $skinNames[$key];
+
+               # Grab the skin class and initialise it.
+               wfSuppressWarnings();
+               // Preload base classes to work around APC/PHP5 bug
+               include_once( "{$wgStyleDirectory}/{$skinName}.deps.php" );
+               wfRestoreWarnings();
+               require_once( "{$wgStyleDirectory}/{$skinName}.php" );
+
+               # Check if we got if not failback to default skin
+               $className = 'Skin'.$skinName;
+               if( !class_exists( $className ) ) {
+                       # DO NOT die if the class isn't found. This breaks maintenance
+                       # scripts and can cause a user account to be unrecoverable
+                       # except by SQL manipulation if a previously valid skin name
+                       # is no longer valid.
+                       wfDebug( "Skin class does not exist: $className\n" );
+                       $className = 'SkinStandard';
+                       require_once( "{$wgStyleDirectory}/Standard.php" );
+               }
+               $skin = new $className;
+               return $skin;
+       }
+
        /** @return string path to the skin stylesheet */
-       function getStylesheet() { return 'common/wikistandard.css?1'; }
+       function getStylesheet() {
+               return 'common/wikistandard.css?1';
+       }
 
        /** @return string skin name */
        function getSkinName() {
@@ -96,21 +157,46 @@ class Skin extends Linker {
        }
 
        function initPage( &$out ) {
+               global $wgFavicon;
+
                $fname = 'Skin::initPage';
                wfProfileIn( $fname );
 
-               $out->addLink( array( 'rel' => 'shortcut icon', 'href' => '/favicon.ico' ) );
+               if( false !== $wgFavicon ) {
+                       $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
+               }
 
                $this->addMetadataLinks($out);
-               
+
                $this->mRevisionId = $out->mRevisionId;
+               
+               $this->preloadExistence();
 
                wfProfileOut( $fname );
        }
 
+       /**
+        * Preload the existence of three commonly-requested pages in a single query
+        */
+       function preloadExistence() {
+               global $wgUser, $wgTitle;
+
+               if ( $wgTitle->isTalkPage() ) {
+                       $otherTab = $wgTitle->getSubjectPage();
+               } else {
+                       $otherTab = $wgTitle->getTalkPage();
+               }
+               $lb = new LinkBatch( array( 
+                       $wgUser->getUserPage(),
+                       $wgUser->getTalkPage(),
+                       $otherTab
+               ));
+               $lb->execute();
+       }
+       
        function addMetadataLinks( &$out ) {
-               global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf, $wgRdfMimeType, $action;
-               global $wgRightsPage, $wgRightsUrl, $wgUseTrackbacks;
+               global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
+               global $wgRightsPage, $wgRightsUrl;
 
                if( $out->isArticleRelated() ) {
                        # note: buggy CC software only reads first "meta" link
@@ -169,15 +255,63 @@ class Skin extends Linker {
 
                $out->out( $this->afterContent() );
 
-               wfProfileClose();
+               $out->out( $this->bottomScripts() );
+
                $out->out( $out->reportTime() );
 
                $out->out( "\n</body></html>" );
        }
 
+       /*static*/ function makeGlobalVariablesScript( $data ) {
+               $r = '<script type= "' . $data['jsmimetype'] . '">
+                       var skin = "' . Xml::escapeJsString( $data['skinname'] ) . '";
+                       var stylepath = "' . Xml::escapeJsString( $data['stylepath'] ) . '";
+
+                       var wgArticlePath = "' . Xml::escapeJsString( $data['articlepath'] ) . '";
+                       var wgScriptPath = "' . Xml::escapeJsString( $data['scriptpath'] ) . '";
+                       var wgServer = "' . Xml::escapeJsString( $data['serverurl'] ) . '";
+                        
+                       var wgCanonicalNamespace = "' . Xml::escapeJsString( $data['nscanonical'] ) . '";
+                       var wgPageName = "' . Xml::escapeJsString( $data['titleprefixeddbkey'] ) . '";
+                       var wgTitle = "' . Xml::escapeJsString( $data['titletext'] ) . '";
+                       var wgArticleId = ' . (int)$data['articleid'] . ';
+                        
+                       var wgUserName = ' . ( $data['username'] == NULL ? 'null' : ( '"' . Xml::escapeJsString( $data['username'] ) . '"' ) ) . ';
+                       var wgUserLanguage = "' . Xml::escapeJsString( $data['userlang'] ) . '";
+                       var wgContentLanguage = "' . Xml::escapeJsString( $data['lang'] ) . '";
+               </script>
+               ';
+               
+               return $r;
+       }
+
        function getHeadScripts() {
-               global $wgStylePath, $wgUser, $wgContLang, $wgAllowUserJs, $wgJsMimeType;
-               $r = "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
+               global $wgStylePath, $wgUser, $wgAllowUserJs, $wgJsMimeType;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
+               global $wgTitle, $wgCanonicalNamespaceNames;
+
+               $nsname = @$wgCanonicalNamespaceNames[ $wgTitle->getNamespace() ];
+               if ( $nsname === NULL ) $nsname = $wgTitle->getNsText();
+
+               $vars = array( 
+                       'jsmimetype' => $wgJsMimeType,
+                       'skinname' => $this->getSkinName(),
+                       'stylepath' => $wgStylePath,
+                       'articlepath' => $wgArticlePath,
+                       'scriptpath' => $wgScriptPath,
+                       'serverurl' => $wgServer,
+                       'nscanonical' => $nsname,
+                       'titleprefixeddbkey' => $wgTitle->getPrefixedDBKey(),
+                       'titletext' => $wgTitle->getText(),
+                       'articleid' => $wgTitle->getArticleId(),
+                       'username' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
+                       'userlang' => $wgLang->getCode(),
+                       'lang' => $wgContLang->getCode(),
+               );
+
+               $r = Skin::makeGlobalVariablesScript( $vars );
+                
+               $r .= "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
                if( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
                        $userpage = $wgUser->getUserPage();
                        $userjs = htmlspecialchars( $this->makeUrl(
@@ -197,7 +331,7 @@ class Skin extends Linker {
         *
         * @param string $action
         * @return bool
-        * @access private
+        * @private
         */
        function userCanPreview( $action ) {
                global $wgTitle, $wgRequest, $wgUser;
@@ -212,9 +346,9 @@ class Skin extends Linker {
                        $wgRequest->getVal( 'wpEditToken' ) );
        }
 
-       # get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
+       # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
        function getUserStylesheet() {
-               global $wgOut, $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
+               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
                $sheet = $this->getStylesheet();
                $action = $wgRequest->getText('action');
                $s = "@import \"$wgStylePath/$sheet\";\n";
@@ -237,7 +371,6 @@ class Skin extends Linker {
         * Return html code that include User stylesheets
         */
        function getUserStyles() {
-               global $wgOut, $wgStylePath, $wgLang;
                $s = "<style type='text/css'>\n";
                $s .= "/*/*/ /*<![CDATA[*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
                $s .= $this->getUserStylesheet();
@@ -250,12 +383,12 @@ class Skin extends Linker {
         * Some styles that are set by user through the user settings interface.
         */
        function doGetUserStyles() {
-               global $wgUser, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
+               global $wgUser, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
 
                $s = '';
-               
+
                if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
-                       if($wgTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
+                       if($wgTitle->isCssSubpage() && $this->userCanPreview( $wgRequest->getText( 'action' ) ) ) {
                                $s .= $wgRequest->getText('wpTextbox1');
                        } else {
                                $userpage = $wgUser->getUserPage();
@@ -309,7 +442,7 @@ END;
        }
 
        function getBodyOptions() {
-               global $wgUser, $wgTitle, $wgNamespaceBackgrounds, $wgOut, $wgRequest;
+               global $wgUser, $wgTitle, $wgOut, $wgRequest;
 
                extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
 
@@ -352,7 +485,7 @@ END;
        }
 
        function doBeforeContent() {
-               global $wgOut, $wgTitle, $wgContLang;
+               global $wgContLang;
                $fname = 'Skin::doBeforeContent';
                wfProfileIn( $fname );
 
@@ -415,22 +548,24 @@ END;
 
 
        function getCategoryLinks () {
-               global $wgOut, $wgTitle, $wgParser;
-               global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgContLang;
+               global $wgOut, $wgTitle, $wgUseCategoryBrowser;
+               global $wgContLang;
 
-               if( !$wgUseCategoryMagic ) return '' ;
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
 
+               # Separator
+               $sep = wfMsgHtml( 'catseparator' );
+
                // Use Unicode bidi embedding override characters,
                // to make sure links don't smash each other up in ugly ways.
                $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
                $embed = "<span dir='$dir'>";
                $pop = '</span>';
-               $t = $embed . implode ( "$pop | $embed" , $wgOut->mCategoryLinks ) . $pop;
-               
-               $msg = count( $wgOut->mCategoryLinks ) === 1 ? 'categories1' : 'categories';
+               $t = $embed . implode ( "{$pop} {$sep} {$embed}" , $wgOut->mCategoryLinks ) . $pop;
+
+               $msg = wfMsgExt('categories', array('parsemag', 'escape'), count( $wgOut->mCategoryLinks ));
                $s = $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Categories' ),
-                       wfMsg( $msg ), 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
+                       $msg, 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
                        . ': ' . $t;
 
                # optional 'dmoz-like' category browser. Will be shown under the list
@@ -454,9 +589,9 @@ END;
        }
 
        /** Render the array as a serie of links.
-        * @param array $tree Categories tree returned by Title::getParentCategoryTree
-        * @param object &skin Skin passed by reference
-        * @return string separated by &gt;, terminate with "\n"
+        * @param $tree Array: categories tree returned by Title::getParentCategoryTree
+        * @param &skin Object: skin passed by reference
+        * @return String separated by &gt;, terminate with "\n"
         */
        function drawCategoryBrowser($tree, &$skin) {
                $return = '';
@@ -487,14 +622,23 @@ END;
        }
 
        /**
-        * This gets called immediately before the </body> tag.
-        * @return string HTML to be put after </body> ???
+        * This gets called shortly before the \</body\> tag.
+        * @return String HTML to be put before \</body\> 
         */
        function afterContent() {
                $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
                return $printfooter . $this->doAfterContent();
        }
 
+       /**
+        * This gets called shortly before the \</body\> tag.
+        * @return String HTML-wrapped JS code to be put before \</body\> 
+        */
+       function bottomScripts() {
+               global $wgJsMimeType;
+               return "\n\t\t<script type=\"$wgJsMimeType\">if (window.runOnloadHook) runOnloadHook();</script>\n";
+       }
+
        /** @return string Retrievied from HTML text */
        function printSource() {
                global $wgTitle;
@@ -511,7 +655,7 @@ END;
        function doAfterContent() { }
 
        function pageTitleLinks() {
-               global $wgOut, $wgTitle, $wgUser, $wgContLang, $wgRequest;
+               global $wgOut, $wgTitle, $wgUser, $wgRequest;
 
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
                $action = $wgRequest->getText( 'action' );
@@ -543,13 +687,12 @@ END;
                }
 
                if ( $wgUser->getNewtalk() ) {
-               # do not show "You have new messages" text when we are viewing our
-               # own talk page
-
+                       # do not show "You have new messages" text when we are viewing our
+                       # own talk page
                        if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
-                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
-                                               wfMsg('newmessageslink') );
-                               $s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
+                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
+                               $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
+                               $s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
                                # disable caching
                                $wgOut->setSquidMaxage(0);
                                $wgOut->enableClientCache(false);
@@ -565,8 +708,9 @@ END;
 
        function getUndeleteLink() {
                global $wgUser, $wgTitle, $wgContLang, $action;
-               if(     (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
-                       ($n = $wgTitle->isDeleted() ) ) 
+               if(     $wgUser->isAllowed( 'deletedhistory' ) &&
+                       (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
+                       ($n = $wgTitle->isDeleted() ) )
                {
                        if ( $wgUser->isAllowed( 'delete' ) ) {
                                $msg = 'thisisdeleted';
@@ -576,7 +720,7 @@ END;
                        return wfMsg( $msg,
                                $this->makeKnownLink(
                                        $wgContLang->SpecialPage( 'Undelete/' . $wgTitle->getPrefixedDBkey() ),
-                                       wfMsg( 'restorelink' . ($n == 1 ? '1' : ''), $n ) ) );
+                                       wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $n ) ) );
                }
                return '';
        }
@@ -604,8 +748,7 @@ END;
        }
 
        function pageTitle() {
-               global $wgOut, $wgTitle, $wgUser;
-
+               global $wgOut;
                $s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
                return $s;
        }
@@ -637,7 +780,7 @@ END;
                                        $c++;
                                        if ($c<count($links)) {
                                                $growinglink .= $link;
-                                               $getlink = $this->makeLink( $growinglink, $link );
+                                               $getlink = $this->makeLink( $growinglink, htmlspecialchars( $link ) );
                                                if(preg_match('/class="new"/i',$getlink)) { break; } # this is a hack, but it saves time
                                                if ($c>1) {
                                                        $subpages .= ' | ';
@@ -718,7 +861,7 @@ END;
                  . '<input type="text" name="search" size="19" value="'
                  . htmlspecialchars(substr($search,0,256)) . "\" />\n"
                  . '<input type="submit" name="go" value="' . wfMsg ('go') . '" />&nbsp;'
-                 . '<input type="submit" name="fulltext" value="' . wfMsg ('search') . "\" />\n</form>";
+                 . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
 
                return $s;
        }
@@ -808,7 +951,7 @@ END;
                if ( !$wgDisableCounters ) {
                        $count = $wgLang->formatNum( $wgArticle->getCount() );
                        if ( $count ) {
-                               $s = wfMsg( 'viewcount', $count );
+                               $s = wfMsgExt( 'viewcount', array( 'parseinline' ), $count );
                        }
                }
 
@@ -833,14 +976,21 @@ END;
                return $s . ' ' .  $this->getCopyright();
        }
 
-       function getCopyright() {
+       function getCopyright( $type = 'detect' ) {
                global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
 
+               if ( $type == 'detect' ) {
+                       $oldid = $wgRequest->getVal( 'oldid' );
+                       $diff = $wgRequest->getVal( 'diff' );
 
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
+                       if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+                               $type = 'history';
+                       } else {
+                               $type = 'normal';
+                       }
+               }
 
-               if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+               if ( $type == 'history' ) {
                        $msg = 'history_copyright';
                } else {
                        $msg = 'copyright';
@@ -860,7 +1010,7 @@ END;
        }
 
        function getCopyrightIcon() {
-               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
+               global $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
                $out = '';
                if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
                        $out = $wgCopyrightIcon;
@@ -924,7 +1074,7 @@ END;
         * @TODO crash bug913. Need to be rewrote completly.
         */
        function specialPagesList() {
-               global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript, $wgAvailableRights;
+               global $wgUser, $wgContLang, $wgServer, $wgRedirectScript;
                require_once('SpecialPage.php');
                $a = array();
                $pages = SpecialPage::getPages();
@@ -935,15 +1085,9 @@ END;
                }
 
                // Other special pages that are restricted.
-               // Copied from SpecialSpecialpages.php
-               foreach($wgAvailableRights as $right) {
-                       if( $wgUser->isAllowed($right) ) {
-                               /** Add all pages for this right */
-                               if(isset($pages[$right])) {
-                                       foreach($pages[$right] as $name => $page) {
-                                       $a[$name] = $page->getDescription();
-                                       }
-                               }
+               foreach ( $pages['restricted'] as $name => $page ) {
+                       if( $wgUser->isAllowed( $page->getRestriction() ) ) {
+                               $a[$name] = $page->getDescription();
                        }
                }
 
@@ -1006,7 +1150,7 @@ END;
        }
 
        function editThisPage() {
-               global $wgOut, $wgTitle, $wgRequest;
+               global $wgOut, $wgTitle;
 
                if ( ! $wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
@@ -1021,16 +1165,18 @@ END;
                }
                return $s;
        }
-       
+
        /**
         * Return URL options for the 'edit page' link.
         * This may include an 'oldid' specifier, if the current page view is such.
         *
         * @return string
-        * @access private
+        * @private
         */
        function editUrlOptions() {
-               if( $this->mRevisionId ) {
+               global $wgArticle;
+
+               if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
                        return "action=edit&oldid=" . intval( $this->mRevisionId );
                } else {
                        return "action=edit";
@@ -1038,7 +1184,7 @@ END;
        }
 
        function deleteThisPage() {
-               global $wgUser, $wgOut, $wgTitle, $wgRequest;
+               global $wgUser, $wgTitle, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
                if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
@@ -1052,7 +1198,7 @@ END;
        }
 
        function protectThisPage() {
-               global $wgUser, $wgOut, $wgTitle, $wgRequest;
+               global $wgUser, $wgTitle, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
                if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
@@ -1071,7 +1217,7 @@ END;
        }
 
        function watchThisPage() {
-               global $wgUser, $wgOut, $wgTitle;
+               global $wgOut, $wgTitle;
 
                if ( $wgOut->isArticleRelated() ) {
                        if ( $wgTitle->userIsWatching() ) {
@@ -1159,7 +1305,7 @@ END;
        }
 
        function otherLanguages() {
-               global $wgOut, $wgContLang, $wgTitle, $wgHideInterlanguageLinks;
+               global $wgOut, $wgContLang, $wgHideInterlanguageLinks;
 
                if ( $wgHideInterlanguageLinks ) {
                        return '';
@@ -1196,13 +1342,10 @@ END;
        }
 
        function dateLink() {
-               global $wgLinkCache;
                $t1 = Title::newFromText( gmdate( 'F j' ) );
                $t2 = Title::newFromText( gmdate( 'Y' ) );
 
-               $wgLinkCache->suspend();
                $id = $t1->getArticleID();
-               $wgLinkCache->resume();
 
                if ( 0 == $id ) {
                        $s = $this->makeBrokenLink( $t1->getText() );
@@ -1211,9 +1354,7 @@ END;
                }
                $s .= ', ';
 
-               $wgLinkCache->suspend();
                $id = $t2->getArticleID();
-               $wgLinkCache->resume();
 
                if ( 0 == $id ) {
                        $s .= $this->makeBrokenLink( $t2->getText() );
@@ -1224,7 +1365,7 @@ END;
        }
 
        function talkLink() {
-               global $wgTitle, $wgLinkCache;
+               global $wgTitle;
 
                if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
                        # No discussion links for special pages
@@ -1241,7 +1382,7 @@ END;
                                $text = wfMsg('userpage');
                                break;
                        case NS_PROJECT:
-                               $text = wfMsg('wikipediapage');
+                               $text = wfMsg('projectpage');
                                break;
                        case NS_IMAGE:
                                $text = wfMsg('imagepage');
@@ -1254,24 +1395,33 @@ END;
                        $text = wfMsg( 'talkpage' );
                }
 
-               $wgLinkCache->suspend();
                $s = $this->makeLinkObj( $link, $text );
-               $wgLinkCache->resume();
 
                return $s;
        }
 
        function commentLink() {
-               global $wgContLang, $wgTitle, $wgLinkCache;
+               global $wgTitle, $wgOut;
 
                if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
                        return '';
                }
-               return $this->makeKnownLinkObj( $wgTitle->getTalkPage(),
-                       wfMsg( 'postcomment' ), 'action=edit&section=new' );
+               
+               # __NEWSECTIONLINK___ changes behaviour here
+               # If it's present, the link points to this page, otherwise
+               # it points to the talk page
+               if( $wgTitle->isTalkPage() ) {
+                       $title =& $wgTitle;
+               } elseif( $wgOut->showNewSectionLink() ) {
+                       $title =& $wgTitle;
+               } else {
+                       $title =& $wgTitle->getTalkPage();
+               }
+               
+               return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit&section=new' );
        }
 
-       /* these are used extensively in SkinPHPTal, but also some other places */
+       /* these are used extensively in SkinTemplate, but also some other places */
        /*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
                $title = Title::makeTitle( NS_SPECIAL, $name );
                return $title->getLocalURL( $urlaction );
@@ -1342,15 +1492,28 @@ END;
         * Build an array that represents the sidebar(s), the navigation bar among them
         *
         * @return array
-        * @access private
+        * @private
         */
        function buildSidebar() {
-               global $wgTitle, $action;
+               global $wgDBname, $parserMemc, $wgEnableSidebarCache;
+               global $wgLang, $wgContLang;
 
                $fname = 'SkinTemplate::buildSidebar';
-               $pageurl = $wgTitle->getLocalURL();
+
                wfProfileIn( $fname );
 
+               $key = "{$wgDBname}:sidebar";
+               $cacheSidebar = $wgEnableSidebarCache &&
+                       ($wgLang->getCode() == $wgContLang->getCode());
+               
+               if ($cacheSidebar) {
+                       $cachedsidebar = $parserMemc->get( $key );
+                       if ($cachedsidebar!="") {
+                               wfProfileOut($fname);
+                               return $cachedsidebar;
+                       }
+               }
+
                $bar = array();
                $lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
                foreach ($lines as $line) {
@@ -1374,16 +1537,15 @@ END;
                                                'text' => $text,
                                                'href' => $href,
                                                'id' => 'n-' . strtr($line[1], ' ', '-'),
-                                               'active' => $pageurl == $href
+                                               'active' => false
                                        );
                                } else { continue; }
                        }
                }
-
+               if ($cacheSidebar)
+                       $cachednotice = $parserMemc->set( $key, $bar, 86400 );
                wfProfileOut( $fname );
                return $bar;
        }
 }
-
-}
 ?>