Code style tweaks per brion's suggestions on Wikitech-l
[lhc/web/wiklou.git] / includes / Skin.php
index d15fca1..da0f507 100644 (file)
@@ -139,7 +139,7 @@ class Skin extends Linker {
 
        /** @return string path to the skin stylesheet */
        function getStylesheet() {
-               return 'common/wikistandard.css?1';
+               return 'common/wikistandard.css';
        }
 
        /** @return string skin name */
@@ -157,7 +157,7 @@ class Skin extends Linker {
        }
 
        function initPage( &$out ) {
-               global $wgFavicon;
+               global $wgFavicon, $wgScriptPath, $wgSitename, $wgLanguageCode, $wgLanguageNames;
 
                $fname = 'Skin::initPage';
                wfProfileIn( $fname );
@@ -166,6 +166,14 @@ class Skin extends Linker {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }
 
+               # OpenSearch description link
+               $out->addLink( array( 
+                       'rel' => 'search', 
+                       'type' => 'application/opensearchdescription+xml',
+                       'href' => "$wgScriptPath/opensearch_desc.php",
+                       'title' => "$wgSitename ({$wgLanguageNames[$wgLanguageCode]})",
+               ));
+
                $this->addMetadataLinks($out);
 
                $this->mRevisionId = $out->mRevisionId;
@@ -255,43 +263,78 @@ class Skin extends Linker {
 
                $out->out( $this->afterContent() );
 
+               $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 wgNamespaceNumber = ' . (int)$data['nsnumber'] . ';
+                       var wgPageName = "' . Xml::escapeJsString( $data['titleprefixeddbkey'] ) . '";
+                       var wgTitle = "' . Xml::escapeJsString( $data['titletext'] ) . '";
+                       var wgArticleId = ' . (int)$data['articleid'] . ';
+                       var wgIsArticle = ' . ( $data['isarticle'] ? 'true' : 'false' ) . ';
+                        
+                       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, $wgAllowUserJs, $wgJsMimeType;
+               global $wgStylePath, $wgUser, $wgAllowUserJs, $wgJsMimeType, $wgStyleVersion;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
-               global $wgTitle, $wgCanonicalNamespaceNames;
+               global $wgTitle, $wgCanonicalNamespaceNames, $wgOut;
 
                $nsname = @$wgCanonicalNamespaceNames[ $wgTitle->getNamespace() ];
                if ( $nsname === NULL ) $nsname = $wgTitle->getNsText();
 
-               $r = '<script type= "'.$wgJsMimeType.'">
-                       var skin = "' . Xml::escapeJsString( $this->getSkinName() ) . '";
-                       var stylepath = "' . Xml::escapeJsString( $wgStylePath ) . '";
+               $vars = array( 
+                       'jsmimetype' => $wgJsMimeType,
+                       'skinname' => $this->getSkinName(),
+                       'stylepath' => $wgStylePath,
+                       'articlepath' => $wgArticlePath,
+                       'scriptpath' => $wgScriptPath,
+                       'serverurl' => $wgServer,
+                       'nscanonical' => $nsname,
+                       'nsnumber' => $wgTitle->getNamespace(),
+                       'titleprefixeddbkey' => $wgTitle->getPrefixedDBKey(),
+                       'titletext' => $wgTitle->getText(),
+                       'articleid' => $wgTitle->getArticleId(),
+                       'isarticle' => $wgOut->isArticle(),
+                       'username' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
+                       'userlang' => $wgLang->getCode(),
+                       'lang' => $wgContLang->getCode(),
+               );
 
-                       var wgArticlePath = "' . Xml::escapeJsString( $wgArticlePath ) . '";
-                       var wgScriptPath = "' . Xml::escapeJsString( $wgScriptPath ) . '";
-                       var wgServer = "' . Xml::escapeJsString( $wgServer ) . '";
-                        
-                       var wgCanonicalNamespace = "' . Xml::escapeJsString( $nsname ) . '";
-                       var wgPageName = "' . Xml::escapeJsString( $wgTitle->getPrefixedDBKey() ) . '";
-                       var wgTitle = "' . Xml::escapeJsString( $wgTitle->getText() ) . '";
-                       var wgArticleId = ' . (int)$wgTitle->getArticleId() . ';
-                        
-                       var wgUserName = ' . ( $wgUser->isAnon() ? 'null' : ( '"' . Xml::escapeJsString( $wgUser->getName() ) . '"' ) ) . ';
-                       var wgUserLanguage = "' . Xml::escapeJsString( $wgLang->getCode() ) . '";
-                       var wgContentLanguage = "' . Xml::escapeJsString( $wgContLang->getCode() ) . '";
-                       var wgSkinClass = "' . Xml::escapeJsString( get_class( $this ) ) . '";
-               </script>
-               ';
+               $r = self::makeGlobalVariablesScript( $vars );
 
-               $r .= "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
+               $r .= "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>\n";
+               global $wgUseSiteJs;
+               if ($wgUseSiteJs) {
+                       if ($wgUser->isLoggedIn()) {
+                               $r .= "<script type=\"$wgJsMimeType\" src=\"".htmlspecialchars(self::makeUrl('-','action=raw&smaxage=0&gen=js'))."\"><!-- site js --></script>\n";
+                       } else {
+                               $r .= "<script type=\"$wgJsMimeType\" src=\"".htmlspecialchars(self::makeUrl('-','action=raw&gen=js'))."\"><!-- site js --></script>\n";
+                       }
+               }
                if( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
                        $userpage = $wgUser->getUserPage();
-                       $userjs = htmlspecialchars( $this->makeUrl(
+                       $userjs = htmlspecialchars( self::makeUrl(
                                $userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
                                'action=raw&ctype='.$wgJsMimeType));
                        $r .= '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>\n";
@@ -325,24 +368,43 @@ class Skin extends Linker {
 
        # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
        function getUserStylesheet() {
-               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
+               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
                $sheet = $this->getStylesheet();
                $action = $wgRequest->getText('action');
-               $s = "@import \"$wgStylePath/$sheet\";\n";
-               if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css\";\n";
+               $s = "@import \"$wgStylePath/common/common.css?$wgStyleVersion\";\n";
+               $s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
+               if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";
 
-               $query = "action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
-               $s .= '@import "' . $this->makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
-                       '@import "'.$this->makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
+               $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
+               $s .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
+                       '@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
 
                $s .= $this->doGetUserStyles();
                return $s."\n";
        }
 
        /**
-        * placeholder, returns generated js in monobook
+        * This returns MediaWiki:Common.js.  For some bizarre reason, it does
+        * *not* return any custom user JS from user subpages.  Huh?
+        *
+        * @return string
         */
-       function getUserJs() { return; }
+       function getUserJs() {
+               $fname = 'Skin::getUserJs';
+               wfProfileIn( $fname );
+
+               global $wgStylePath;
+               $s = "/* generated javascript */\n";
+               $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';";
+               $s .= "\n\n/* MediaWiki:Common.js */\n";
+               $commonJs = wfMsgForContent('Common.js');
+               if ( !wfEmptyMsg ( 'Common.js', $commonJs ) ) {
+                       $s .= $commonJs;
+               }
+
+               wfProfileOut( $fname );
+               return $s;
+    }
 
        /**
         * Return html code that include User stylesheets
@@ -369,7 +431,7 @@ class Skin extends Linker {
                                $s .= $wgRequest->getText('wpTextbox1');
                        } else {
                                $userpage = $wgUser->getUserPage();
-                               $s.= '@import "'.$this->makeUrl(
+                               $s.= '@import "'.self::makeUrl(
                                        $userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
                                        'action=raw&ctype=text/css').'";'."\n";
                        }
@@ -419,7 +481,7 @@ END;
        }
 
        function getBodyOptions() {
-               global $wgUser, $wgTitle, $wgOut, $wgRequest;
+               global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
 
                extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
 
@@ -442,6 +504,8 @@ END;
                        }
                        $a['onload'] .= 'setupRightClickEdit()';
                }
+               $a['class'] = 'ns-'.$wgTitle->getNamespace().' '.($wgContLang->isRTL() ? "rtl" : "ltr").
+               ' '.Sanitizer::escapeId( 'page-'.$wgTitle->getPrefixedText() );
                return $a;
        }
 
@@ -540,9 +604,8 @@ END;
                $pop = '</span>';
                $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' ),
-                       $msg, 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
+               $msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escape' ), count( $wgOut->mCategoryLinks ) );
+               $s = $this->makeLinkObj( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
                        . ': ' . $t;
 
                # optional 'dmoz-like' category browser. Will be shown under the list
@@ -599,14 +662,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;
@@ -789,7 +861,7 @@ END;
                        } else { $q = "returnto={$rt}"; }
 
                        $s .= "\n<br />" . $this->makeKnownLinkObj(
-                               Title::makeTitle( NS_SPECIAL, 'Userlogin' ),
+                               SpecialPage::getTitleFor( 'Userlogin' ),
                                wfMsg( 'login' ), $q );
                } else {
                        $n = $wgUser->getName();
@@ -801,7 +873,7 @@ END;
 
                        $s .= $this->makeKnownLinkObj( $wgUser->getUserPage(),
                          $n ) . "{$tl}<br />" .
-                         $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Userlogout' ), wfMsg( 'logout' ),
+                         $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
                          "returnto={$rt}" ) . ' | ' .
                          $this->specialLink( 'preferences' );
                }
@@ -812,7 +884,7 @@ END;
        }
 
        function getSearchLink() {
-               $searchPage =& Title::makeTitle( NS_SPECIAL, 'Search' );
+               $searchPage =& SpecialPage::getTitleFor( 'Search' );
                return $searchPage->getLocalURL();
        }
 
@@ -828,7 +900,7 @@ END;
                  . $this->escapeSearchLink() . "\">\n"
                  . '<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="go" value="' . wfMsg ('searcharticle') . '" />&nbsp;'
                  . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
 
                return $s;
@@ -847,7 +919,38 @@ END;
                }
                # Many people don't like this dropdown box
                #$s .= $sep . $this->specialPagesList();
+               
+               $s .= $this->variantLinks();
+               
+               $s .= $this->extensionTabLinks();
 
+               return $s;
+       }
+       
+       /**
+        * Compatibility for extensions adding functionality through tabs.
+        * Eventually these old skins should be replaced with SkinTemplate-based
+        * versions, sigh...
+        * @return string
+        */
+       function extensionTabLinks() {
+               $tabs = array();
+               $s = '';
+               wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
+               foreach( $tabs as $tab ) {
+                       $s .= ' | ' . Xml::element( 'a',
+                               array( 'href' => $tab['href'] ),
+                               $tab['text'] );
+               }
+               return $s;
+       }
+       
+       /**
+        * Language/charset variant links for classic-style skins
+        * @return string
+        */
+       function variantLinks() {
+               $s = '';
                /* show links to different language variants */
                global $wgDisableLangConversion, $wgContLang, $wgTitle;
                $variants = $wgContLang->getVariants();
@@ -856,10 +959,9 @@ END;
                                $varname = $wgContLang->getVariantname( $code );
                                if( $varname == 'disable' )
                                        continue;
-                               $s .= ' | <a href="' . $wgTitle->getLocalUrl( 'variant=' . $code ) . '">' . $varname . '</a>';
+                               $s .= ' | <a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>';
                        }
                }
-
                return $s;
        }
 
@@ -1009,8 +1111,9 @@ END;
 
                $timestamp = $wgArticle->getTimestamp();
                if ( $timestamp ) {
-                       $d = $wgLang->timeanddate( $timestamp, true );
-                       $s = ' ' . wfMsg( 'lastmodified', $d );
+                       $d = $wgLang->date( $timestamp, true );
+                       $t = $wgLang->time( $timestamp, true );
+                       $s = ' ' . wfMsg( 'lastmodifiedat', $d, $t );
                } else {
                        $s = '';
                }
@@ -1039,24 +1142,13 @@ END;
 
        /**
         * show a drop-down box of special pages
-        * @TODO crash bug913. Need to be rewrote completly.
         */
        function specialPagesList() {
                global $wgUser, $wgContLang, $wgServer, $wgRedirectScript;
-               require_once('SpecialPage.php');
                $a = array();
-               $pages = SpecialPage::getPages();
-
-               // special pages without access restriction
-               foreach ( $pages[''] as $name => $page ) {
-                       $a[$name] = $page->getDescription();
-               }
-
-               // Other special pages that are restricted.
-               foreach ( $pages['restricted'] as $name => $page ) {
-                       if( $wgUser->isAllowed( $page->getRestriction() ) ) {
-                               $a[$name] = $page->getDescription();
-                       }
+               $pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
+               foreach ( $pages as $name => $page ) {
+                       $pages[$name] = $page->getDescription();
                }
 
                $go = wfMsg( 'go' );
@@ -1069,7 +1161,7 @@ END;
                $s .= "<option value=\"{$spp}\">{$sp}</option>\n";
 
 
-               foreach ( $a as $name => $desc ) {
+               foreach ( $pages as $name => $desc ) {
                        $p = $wgContLang->specialPage( $name );
                        $s .= "<option value=\"{$p}\">{$desc}</option>\n";
                }
@@ -1206,7 +1298,7 @@ END;
                global $wgTitle;
 
                if ( $wgTitle->userCanMove() ) {
-                       return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Movepage' ),
+                       return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
                          wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
                } else {
                        // no message if page is protected - would be redundant
@@ -1224,15 +1316,17 @@ END;
        function whatLinksHere() {
                global $wgTitle;
 
-               return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' ),
-                 wfMsg( 'whatlinkshere' ), 'target=' . $wgTitle->getPrefixedURL() );
+               return $this->makeKnownLinkObj( 
+                       SpecialPage::getTitleFor( 'Whatlinkshere', $wgTitle->getPrefixedDBkey() ), 
+                       wfMsg( 'whatlinkshere' ) );
        }
 
        function userContribsLink() {
                global $wgTitle;
 
-               return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ),
-                 wfMsg( 'contributions' ), 'target=' . $wgTitle->getPartialURL() );
+               return $this->makeKnownLinkObj( 
+                       SpecialPage::getTitleFor( 'Contributions', $wgTitle->getDBkey() ),
+                       wfMsg( 'contributions' ) );
        }
 
        function showEmailUser( $id ) {
@@ -1249,8 +1343,9 @@ END;
        function emailUserLink() {
                global $wgTitle;
 
-               return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Emailuser' ),
-                 wfMsg( 'emailuser' ), 'target=' . $wgTitle->getPartialURL() );
+               return $this->makeKnownLinkObj( 
+                       SpecialPage::getTitleFor( 'Emailuser', $wgTitle->getDBkey() ),
+                       wfMsg( 'emailuser' ) );
        }
 
        function watchPageLinksLink() {
@@ -1259,9 +1354,9 @@ END;
                if ( ! $wgOut->isArticleRelated() ) {
                        return '(' . wfMsg( 'notanarticle' ) . ')';
                } else {
-                       return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL,
-                         'Recentchangeslinked' ), wfMsg( 'recentchangeslinked' ),
-                         'target=' . $wgTitle->getPrefixedURL() );
+                       return $this->makeKnownLinkObj( 
+                               SpecialPage::getTitleFor( 'Recentchangeslinked', $wgTitle->getPrefixedDBkey() ), 
+                               wfMsg( 'recentchangeslinked' ) );
                }
        }
 
@@ -1343,20 +1438,32 @@ END;
                if( $wgTitle->isTalkPage() ) {
                        $link = $wgTitle->getSubjectPage();
                        switch( $link->getNamespace() ) {
-                       case NS_MAIN:
-                               $text = wfMsg('articlepage');
-                               break;
-                       case NS_USER:
-                               $text = wfMsg('userpage');
-                               break;
-                       case NS_PROJECT:
-                               $text = wfMsg('projectpage');
-                               break;
-                       case NS_IMAGE:
-                               $text = wfMsg('imagepage');
-                               break;
-                       default:
-                               $text= wfMsg('articlepage');
+                               case NS_MAIN:
+                                       $text = wfMsg( 'articlepage' );
+                                       break;
+                               case NS_USER:
+                                       $text = wfMsg( 'userpage' );
+                                       break;
+                               case NS_PROJECT:
+                                       $text = wfMsg( 'projectpage' );
+                                       break;
+                               case NS_IMAGE:
+                                       $text = wfMsg( 'imagepage' );
+                                       break;
+                               case NS_MEDIAWIKI:
+                                       $text = wfMsg( 'mediawikipage' );
+                                       break;
+                               case NS_TEMPLATE:
+                                       $text = wfMsg( 'templatepage' );
+                                       break;
+                               case NS_HELP:
+                                       $text = wfMsg( 'viewhelppage' );
+                                       break;
+                               case NS_CATEGORY:
+                                       $text = wfMsg( 'categorypage' );
+                                       break;
+                               default:
+                                       $text = wfMsg( 'articlepage' );
                        }
                } else {
                        $link = $wgTitle->getTalkPage();
@@ -1390,56 +1497,56 @@ END;
        }
 
        /* these are used extensively in SkinTemplate, but also some other places */
-       /*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
-               $title = Title::makeTitle( NS_SPECIAL, $name );
+       static function makeSpecialUrl( $name, $urlaction = '' ) {
+               $title = SpecialPage::getTitleFor( $name );
                return $title->getLocalURL( $urlaction );
        }
 
-       /*static*/ function makeI18nUrl ( $name, $urlaction='' ) {
-               $title = Title::newFromText( wfMsgForContent($name) );
-               $this->checkTitle($title, $name);
+       static function makeI18nUrl( $name, $urlaction = '' ) {
+               $title = Title::newFromText( wfMsgForContent( $name ) );
+               self::checkTitle( $title, $name );
                return $title->getLocalURL( $urlaction );
        }
 
-       /*static*/ function makeUrl ( $name, $urlaction='' ) {
+       static function makeUrl( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
-               $this->checkTitle($title, $name);
+               self::checkTitle( $title, $name );
                return $title->getLocalURL( $urlaction );
        }
 
        # If url string starts with http, consider as external URL, else
        # internal
-       /*static*/ function makeInternalOrExternalUrl( $name ) {
+       static function makeInternalOrExternalUrl( $name ) {
                if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $name ) ) {
                        return $name;
                } else {
-                       return $this->makeUrl( $name );
+                       return self::makeUrl( $name );
                }
        }
 
        # this can be passed the NS number as defined in Language.php
-       /*static*/ function makeNSUrl( $name, $urlaction='', $namespace=NS_MAIN ) {
+       static function makeNSUrl( $name, $urlaction = '', $namespace = NS_MAIN ) {
                $title = Title::makeTitleSafe( $namespace, $name );
-               $this->checkTitle($title, $name);
+               self::checkTitle( $title, $name );
                return $title->getLocalURL( $urlaction );
        }
 
        /* these return an array with the 'href' and boolean 'exists' */
-       /*static*/ function makeUrlDetails ( $name, $urlaction='' ) {
+       static function makeUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
-               $this->checkTitle($title, $name);
+               self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0?true:false
+                       'exists' => $title->getArticleID() != 0 ? true : false
                );
        }
 
        /**
         * Make URL details where the article exists (or at least it's convenient to think so)
         */
-       function makeKnownUrlDetails( $name, $urlaction='' ) {
+       static function makeKnownUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
-               $this->checkTitle($title, $name);
+               self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
                        'exists' => true
@@ -1447,10 +1554,10 @@ END;
        }
 
        # make sure we have some title to operate on
-       /*static*/ function checkTitle ( &$title, &$name ) {
-               if(!is_object($title)) {
+       static function checkTitle( &$title, &$name ) {
+               if( !is_object( $title ) ) {
                        $title = Title::newFromText( $name );
-                       if(!is_object($title)) {
+                       if( !is_object( $title ) ) {
                                $title = Title::newFromText( '--error: link target missing--' );
                        }
                }
@@ -1463,14 +1570,14 @@ END;
         * @private
         */
        function buildSidebar() {
-               global $wgDBname, $parserMemc, $wgEnableSidebarCache;
+               global $parserMemc, $wgEnableSidebarCache;
                global $wgLang, $wgContLang;
 
                $fname = 'SkinTemplate::buildSidebar';
 
                wfProfileIn( $fname );
 
-               $key = "{$wgDBname}:sidebar";
+               $key = wfMemcKey( 'sidebar' );
                $cacheSidebar = $wgEnableSidebarCache &&
                        ($wgLang->getCode() == $wgContLang->getCode());
                
@@ -1500,7 +1607,19 @@ END;
                                                $text = $line[1];
                                        if (wfEmptyMsg($line[0], $link))
                                                $link = $line[0];
-                                       $href = $this->makeInternalOrExternalUrl( $link );
+
+                                       if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
+                                               $href = $link;
+                                       } else {
+                                               $title = Title::newFromText( $link );
+                                               if ( $title ) {
+                                                       $title = $title->fixSpecialName();
+                                                       $href = $title->getLocalURL();
+                                               } else {
+                                                       $href = 'INVALID-TITLE';
+                                               }
+                                       }
+
                                        $bar[$heading][] = array(
                                                'text' => $text,
                                                'href' => $href,