]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/SkinTemplate.php
MediaWiki 1.17.1
[autoinstallsdev/mediawiki.git] / includes / SkinTemplate.php
index 4f13571a541d33fb57d567b623ebc681521f6be0..023afdd88a5dd13db1f8104c57c7e7b50cb3050d 100644 (file)
@@ -1,22 +1,28 @@
 <?php
+/**
+ * Base class for template-based skins
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
 if ( ! defined( 'MEDIAWIKI' ) )
        die( 1 );
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
 /**
  * Wrapper object for MediaWiki's localization functions,
  * to be passed to the template engine.
@@ -27,11 +33,11 @@ if ( ! defined( 'MEDIAWIKI' ) )
 class MediaWiki_I18N {
        var $_context = array();
 
-       function set($varName, $value) {
+       function set( $varName, $value ) {
                $this->_context[$varName] = $value;
        }
 
-       function translate($value) {
+       function translate( $value ) {
                wfProfileIn( __METHOD__ );
 
                // Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
@@ -40,12 +46,12 @@ class MediaWiki_I18N {
                $value = wfMsg( $value );
                // interpolate variables
                $m = array();
-               while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
-                       list($src, $var) = $m;
+               while( preg_match( '/\$([0-9]*?)/sm', $value, $m ) ) {
+                       list( $src, $var ) = $m;
                        wfSuppressWarnings();
                        $varValue = $this->_context[$var];
                        wfRestoreWarnings();
-                       $value = str_replace($src, $varValue, $value);
+                       $value = str_replace( $src, $varValue, $value );
                }
                wfProfileOut( __METHOD__ );
                return $value;
@@ -70,38 +76,30 @@ class SkinTemplate extends Skin {
         */
 
        /**
-        * Name of our skin, set in initPage()
-        * It probably need to be all lower case.
+        * Name of our skin, it probably needs to be all lower case.  Child classes
+        * should override the default.
         */
-       var $skinname;
+       var $skinname = 'monobook';
 
        /**
-        * Stylesheets set to use
-        * Sub directory in ./skins/ where various stylesheets are located
+        * Stylesheets set to use.  Subdirectory in skins/ where various stylesheets
+        * are located.  Child classes should override the default.
         */
-       var $stylename;
+       var $stylename = 'monobook';
 
        /**
-        * For QuickTemplate, the name of the subclass which
-        * will actually fill the template.
+        * For QuickTemplate, the name of the subclass which will actually fill the
+        * template.  Child classes should override the default.
         */
-       var $template;
-
-       /**#@-*/
+       var $template = 'QuickTemplate';
 
        /**
-        * Setup the base parameters...
-        * Child classes should override this to set the name,
-        * style subdirectory, and template filler callback.
-        *
-        * @param $out OutputPage
+        * Whether this skin use OutputPage::headElement() to generate the <head>
+        * tag
         */
-       function initPage( OutputPage $out ) {
-               parent::initPage( $out );
-               $this->skinname  = 'monobook';
-               $this->stylename = 'monobook';
-               $this->template  = 'QuickTemplate';
-       }
+       var $useHeadElement = false;
+
+       /**#@-*/
 
        /**
         * Add specific styles for this skin
@@ -109,8 +107,7 @@ class SkinTemplate extends Skin {
         * @param $out OutputPage
         */
        function setupSkinUserCss( OutputPage $out ){
-               $out->addStyle( 'common/shared.css', 'screen' );
-               $out->addStyle( 'common/commonPrint.css', 'print' );    
+               $out->addModuleStyles( array( 'mediawiki.legacy.shared', 'mediawiki.legacy.commonPrint' ) );
        }
 
        /**
@@ -118,13 +115,13 @@ class SkinTemplate extends Skin {
         * and eventually it spits out some HTML. Should have interface
         * roughly equivalent to PHPTAL 0.7.
         *
-        * @param $callback string (or file)
+        * @param $classname string (or file)
         * @param $repository string: subdirectory where we keep template files
         * @param $cache_dir string
         * @return object
         * @private
         */
-       function setupTemplate( $classname, $repository=false, $cache_dir=false ) {
+       function setupTemplate( $classname, $repository = false, $cache_dir = false ) {
                return new $classname();
        }
 
@@ -134,38 +131,50 @@ class SkinTemplate extends Skin {
         * @param $out OutputPage
         */
        function outputPage( OutputPage $out ) {
-               global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang;
-               global $wgScript, $wgStylePath, $wgContLanguageCode;
+               global $wgArticle, $wgUser, $wgLang, $wgContLang;
+               global $wgScript, $wgStylePath, $wgLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
-               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
-               global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
+               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version;
+               global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
-               global $wgUseTrackbacks, $wgUseSiteJs;
-               global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
+               global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgProfiler;
 
                wfProfileIn( __METHOD__ );
+               if ( is_object( $wgProfiler ) ) {
+                       $wgProfiler->setTemplated( true );
+               }
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
+               $action = $wgRequest->getVal( 'action', 'view' );
 
-               wfProfileIn( __METHOD__."-init" );
+               wfProfileIn( __METHOD__ . '-init' );
                $this->initPage( $out );
 
                $this->setMembers();
                $tpl = $this->setupTemplate( $this->template, 'skins' );
 
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
-               $tpl->setTranslator(new MediaWiki_I18N());
+               $tpl->setTranslator( new MediaWiki_I18N() );
                #}
-               wfProfileOut( __METHOD__."-init" );
+               wfProfileOut( __METHOD__ . '-init' );
 
-               wfProfileIn( __METHOD__."-stuff" );
-               $this->thispage = $this->mTitle->getPrefixedDbKey();
+               wfProfileIn( __METHOD__ . '-stuff' );
+               $this->thispage = $this->mTitle->getPrefixedDBkey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
+               $query = array();
+               if ( !$wgRequest->wasPosted() ) {
+                       $query = $wgRequest->getValues();
+                       unset( $query['title'] );
+                       unset( $query['returnto'] );
+                       unset( $query['returntoquery'] );
+               }
+               $this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
                $this->loggedin = $wgUser->isLoggedIn();
-               $this->iscontent = ($this->mTitle->getNamespace() != NS_SPECIAL );
-               $this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
+               $this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );
+               $this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) );
                $this->username = $wgUser->getName();
 
                if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
@@ -176,22 +185,59 @@ class SkinTemplate extends Skin {
                        $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
                }
 
-               $this->userjs = $this->userjsprev = false;
-               $this->setupUserCss( $out );
-               $this->setupUserJs( $out->isUserJsAllowed() );
                $this->titletxt = $this->mTitle->getPrefixedText();
-               wfProfileOut( __METHOD__."-stuff" );
+               wfProfileOut( __METHOD__ . '-stuff' );
+
+               wfProfileIn( __METHOD__ . '-stuff-head' );
+               if ( $this->useHeadElement ) {
+                       $pagecss = $this->setupPageCss();
+                       if( $pagecss )
+                               $out->addInlineStyle( $pagecss );
+               } else {
+                       $this->setupUserCss( $out );
+
+                       $tpl->set( 'pagecss', $this->setupPageCss() );
+                       $tpl->setRef( 'usercss', $this->usercss );
+
+                       $this->userjs = $this->userjsprev = false;
+                       $this->setupUserJs( $out->isUserJsAllowed() );
+                       $tpl->setRef( 'userjs', $this->userjs );
+                       $tpl->setRef( 'userjsprev', $this->userjsprev );
+
+                       if( $wgUseSiteJs ) {
+                               $jsCache = $this->loggedin ? '&smaxage=0' : '';
+                               $tpl->set( 'jsvarurl',
+                                                 self::makeUrl( '-',
+                                                                               "action=raw$jsCache&gen=js&useskin=" .
+                                                                               urlencode( $this->getSkinName() ) ) );
+                       } else {
+                               $tpl->set( 'jsvarurl', false );
+                       }
 
-               wfProfileIn( __METHOD__."-stuff2" );
+                       $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
+                       $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
+                       $tpl->set( 'html5version', $wgHtml5Version );
+                       $tpl->set( 'headlinks', $out->getHeadLinks( $this ) );
+                       $tpl->set( 'csslinks', $out->buildCssLinks( $this ) );
+
+                       if( $wgUseTrackbacks && $out->isArticleRelated() ) {
+                               $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() );
+                       } else {
+                               $tpl->set( 'trackbackhtml', null );
+                       }
+               }
+               wfProfileOut( __METHOD__ . '-stuff-head' );
+
+               wfProfileIn( __METHOD__ . '-stuff2' );
                $tpl->set( 'title', $out->getPageTitle() );
                $tpl->set( 'pagetitle', $out->getHTMLTitle() );
                $tpl->set( 'displaytitle', $out->mPageLinkTitle );
                $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
-               $tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) );
+               $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
 
-               $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
-                         $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
-                         $this->mTitle->getNsText();
+               $nsname = MWNamespace::exists( $this->mTitle->getNamespace() ) ?
+                                       MWNamespace::getCanonicalName( $this->mTitle->getNamespace() ) :
+                                       $this->mTitle->getNsText();
 
                $tpl->set( 'nscanonical', $nsname );
                $tpl->set( 'nsnumber', $this->mTitle->getNamespace() );
@@ -202,54 +248,45 @@ class SkinTemplate extends Skin {
 
                $tpl->set( 'isarticle', $out->isArticle() );
 
-               $tpl->setRef( "thispage", $this->thispage );
+               $tpl->setRef( 'thispage', $this->thispage );
                $subpagestr = $this->subPageSubtitle();
                $tpl->set(
-                       'subtitle',  !empty($subpagestr)?
-                       '<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle():
+                       'subtitle', !empty( $subpagestr ) ?
+                       '<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle() :
                        $out->getSubtitle()
                );
                $undelete = $this->getUndeleteLink();
                $tpl->set(
-                       "undelete", !empty($undelete)?
-                       '<span class="subpages">'.$undelete.'</span>':
+                       'undelete', !empty( $undelete ) ?
+                       '<span class="subpages">'.$undelete.'</span>' :
                        ''
                );
 
-               $tpl->set( 'catlinks', $this->getCategories());
+               $tpl->set( 'catlinks', $this->getCategories() );
                if( $out->isSyndicated() ) {
                        $feeds = array();
                        foreach( $out->getSyndicationLinks() as $format => $link ) {
                                $feeds[$format] = array(
                                        'text' => wfMsg( "feed-$format" ),
-                                       'href' => $link );
+                                       'href' => $link
+                               );
                        }
                        $tpl->setRef( 'feeds', $feeds );
                } else {
                        $tpl->set( 'feeds', false );
                }
-               if ($wgUseTrackbacks && $out->isArticleRelated()) {
-                       $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() );
-               } else {
-                       $tpl->set( 'trackbackhtml', null );
-               }
 
-               $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
-               $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
                $tpl->setRef( 'mimetype', $wgMimeType );
                $tpl->setRef( 'jsmimetype', $wgJsMimeType );
                $tpl->setRef( 'charset', $wgOutputEncoding );
-               $tpl->set( 'headlinks', $out->getHeadLinks() );
-               $tpl->set( 'headscripts', $out->getScript() );
-               $tpl->set( 'csslinks', $out->buildCssLinks() );
                $tpl->setRef( 'wgScript', $wgScript );
                $tpl->setRef( 'skinname', $this->skinname );
                $tpl->set( 'skinclass', get_class( $this ) );
                $tpl->setRef( 'stylename', $this->stylename );
-               $tpl->set( 'printable', $wgRequest->getBool( 'printable' ) );
+               $tpl->set( 'printable', $out->isPrintable() );
                $tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
                $tpl->setRef( 'loggedin', $this->loggedin );
-               $tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
+               $tpl->set( 'notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL );
                /* XXX currently unused, might get useful later
                $tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
                $tpl->set( "exists", $this->mTitle->getArticleID() != 0 );
@@ -258,110 +295,89 @@ class SkinTemplate extends Skin {
                $tpl->set( "helppage", wfMsg('helppage'));
                */
                $tpl->set( 'searchaction', $this->escapeSearchLink() );
+               $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBKey() );
                $tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) );
                $tpl->setRef( 'stylepath', $wgStylePath );
                $tpl->setRef( 'articlepath', $wgArticlePath );
                $tpl->setRef( 'scriptpath', $wgScriptPath );
                $tpl->setRef( 'serverurl', $wgServer );
                $tpl->setRef( 'logopath', $wgLogo );
-               $tpl->setRef( "lang", $wgContLanguageCode );
-               $tpl->set( 'dir', $wgContLang->isRTL() ? "rtl" : "ltr" );
-               $tpl->set( 'rtl', $wgContLang->isRTL() );
-               $tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
+
+               $lang = wfUILang();
+               $tpl->set( 'lang', $lang->getCode() );
+               $tpl->set( 'dir', $lang->getDir() );
+               $tpl->set( 'rtl', $lang->isRTL() );
+
+               $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
                $tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
-               $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
-               $tpl->setRef( 'userpage', $this->userpage);
-               $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
+               $tpl->set( 'username', $wgUser->isAnon() ? null : $this->username );
+               $tpl->setRef( 'userpage', $this->userpage );
+               $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
                $tpl->set( 'userlang', $wgLang->getCode() );
-               $tpl->set( 'pagecss', $this->setupPageCss() );
-               $tpl->setRef( 'usercss', $this->usercss);
-               $tpl->setRef( 'userjs', $this->userjs);
-               $tpl->setRef( 'userjsprev', $this->userjsprev);
-               if( $wgUseSiteJs ) {
-                       $jsCache = $this->loggedin ? '&smaxage=0' : '';
-                       $tpl->set( 'jsvarurl',
-                               self::makeUrl('-',
-                                       "action=raw$jsCache&gen=js&useskin=" .
-                                               urlencode( $this->getSkinName() ) ) );
-               } else {
-                       $tpl->set('jsvarurl', false);
-               }
-               $newtalks = $wgUser->getNewMessageLinks();
-
-               if (count($newtalks) == 1 && $newtalks[0]["wiki"] === wfWikiID() ) {
-                       $usertitle = $this->mUser->getUserPage();
-                       $usertalktitle = $usertitle->getTalkPage();
-                       if( !$usertalktitle->equals( $this->mTitle ) ) {
-                               $ntl = wfMsg( 'youhavenewmessages',
-                                       $this->makeKnownLinkObj(
-                                               $usertalktitle,
-                                               wfMsgHtml( 'newmessageslink' ),
-                                               'redirect=no'
-                                       ),
-                                       $this->makeKnownLinkObj(
-                                               $usertalktitle,
-                                               wfMsgHtml( 'newmessagesdifflink' ),
-                                               'diff=cur'
-                                       )
-                               );
-                               # Disable Cache
-                               $out->setSquidMaxage(0);
-                       }
-               } else if (count($newtalks)) {
-                       $sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
-                       $msgs = array();
-                       foreach ($newtalks as $newtalk) {
-                               $msgs[] = Xml::element("a",
-                                       array('href' => $newtalk["link"]), $newtalk["wiki"]);
+
+               // Users can have their language set differently than the
+               // content of the wiki. For these users, tell the web browser
+               // that interface elements are in a different language.
+               $tpl->set( 'userlangattributes', '' );
+               $tpl->set( 'specialpageattributes', '' );
+
+               $lang = $wgLang->getCode();
+               $dir  = $wgLang->getDir();
+               if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
+                       $attrs = " lang='$lang' dir='$dir'";
+
+                       $tpl->set( 'userlangattributes', $attrs );
+
+                       // The content of SpecialPages should be presented in the
+                       // user's language. Content of regular pages should not be touched.
+                       if( $this->mTitle->isSpecialPage() ) {
+                               $tpl->set( 'specialpageattributes', $attrs );
                        }
-                       $parts = implode($sep, $msgs);
-                       $ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
-                       $out->setSquidMaxage(0);
-               } else {
-                       $ntl = '';
                }
-               wfProfileOut( __METHOD__."-stuff2" );
 
-               wfProfileIn( __METHOD__."-stuff3" );
-               $tpl->setRef( 'newtalk', $ntl );
+               $newtalks = $this->getNewtalks();
+
+               wfProfileOut( __METHOD__ . '-stuff2' );
+
+               wfProfileIn( __METHOD__ . '-stuff3' );
+               $tpl->setRef( 'newtalk', $newtalks );
                $tpl->setRef( 'skin', $this );
                $tpl->set( 'logo', $this->logoText() );
-               if ( $out->isArticle() and (!isset( $oldid ) or isset( $diff )) and
-                       $wgArticle and 0 != $wgArticle->getID() )
-               {
+               if ( $out->isArticle() and ( !isset( $oldid ) or isset( $diff ) ) and
+                       $wgArticle and 0 != $wgArticle->getID() ){
                        if ( !$wgDisableCounters ) {
                                $viewcount = $wgLang->formatNum( $wgArticle->getCount() );
                                if ( $viewcount ) {
-                                       $tpl->set('viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
+                                       $tpl->set( 'viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
                                } else {
-                                       $tpl->set('viewcount', false);
+                                       $tpl->set( 'viewcount', false );
                                }
                        } else {
-                               $tpl->set('viewcount', false);
+                               $tpl->set( 'viewcount', false );
                        }
 
-                       if ($wgPageShowWatchingUsers) {
+                       if( $wgPageShowWatchingUsers ) {
                                $dbr = wfGetDB( DB_SLAVE );
-                               $watchlist = $dbr->tableName( 'watchlist' );
-                               $sql = "SELECT COUNT(*) AS n FROM $watchlist
-                                       WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) .
-                                       "' AND  wl_namespace=" . $this->mTitle->getNamespace() ;
-                               $res = $dbr->query( $sql, 'SkinTemplate::outputPage');
+                               $res = $dbr->select( 'watchlist',
+                                       array( 'COUNT(*) AS n' ),
+                                       array( 'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ), 'wl_namespace' => $this->mTitle->getNamespace() ),
+                                       __METHOD__
+                               );
                                $x = $dbr->fetchObject( $res );
                                $numberofwatchingusers = $x->n;
-                               if ($numberofwatchingusers > 0) {
-                                       $tpl->set('numberofwatchingusers',
-                                               wfMsgExt('number_of_watching_users_pageview', array('parseinline'),
-                                               $wgLang->formatNum($numberofwatchingusers))
+                               if( $numberofwatchingusers > 0 ) {
+                                       $tpl->set( 'numberofwatchingusers',
+                                               wfMsgExt( 'number_of_watching_users_pageview', array( 'parseinline' ),
+                                               $wgLang->formatNum( $numberofwatchingusers ) )
                                        );
                                } else {
-                                       $tpl->set('numberofwatchingusers', false);
+                                       $tpl->set( 'numberofwatchingusers', false );
                                }
                        } else {
-                               $tpl->set('numberofwatchingusers', false);
+                               $tpl->set( 'numberofwatchingusers', false );
                        }
 
-                       $tpl->set('copyright',$this->getCopyright());
+                       $tpl->set( 'copyright', $this->getCopyright() );
 
                        $this->credits = false;
 
@@ -374,34 +390,74 @@ class SkinTemplate extends Skin {
                        $tpl->setRef( 'credits', $this->credits );
 
                } elseif ( isset( $oldid ) && !isset( $diff ) ) {
-                       $tpl->set('copyright', $this->getCopyright());
-                       $tpl->set('viewcount', false);
-                       $tpl->set('lastmod', false);
-                       $tpl->set('credits', false);
-                       $tpl->set('numberofwatchingusers', false);
+                       $tpl->set( 'copyright', $this->getCopyright() );
+                       $tpl->set( 'viewcount', false );
+                       $tpl->set( 'lastmod', false );
+                       $tpl->set( 'credits', false );
+                       $tpl->set( 'numberofwatchingusers', false );
                } else {
-                       $tpl->set('copyright', false);
-                       $tpl->set('viewcount', false);
-                       $tpl->set('lastmod', false);
-                       $tpl->set('credits', false);
-                       $tpl->set('numberofwatchingusers', false);
+                       $tpl->set( 'copyright', false );
+                       $tpl->set( 'viewcount', false );
+                       $tpl->set( 'lastmod', false );
+                       $tpl->set( 'credits', false );
+                       $tpl->set( 'numberofwatchingusers', false );
                }
-               wfProfileOut( __METHOD__."-stuff3" );
+               wfProfileOut( __METHOD__ . '-stuff3' );
 
-               wfProfileIn( __METHOD__."-stuff4" );
+               wfProfileIn( __METHOD__ . '-stuff4' );
                $tpl->set( 'copyrightico', $this->getCopyrightIcon() );
                $tpl->set( 'poweredbyico', $this->getPoweredBy() );
                $tpl->set( 'disclaimer', $this->disclaimerLink() );
                $tpl->set( 'privacy', $this->privacyLink() );
                $tpl->set( 'about', $this->aboutLink() );
 
-               $tpl->setRef( 'debug', $out->mDebugtext );
+               $tpl->set( 'footerlinks', array(
+                       'info' => array(
+                               'lastmod',
+                               'viewcount',
+                               'numberofwatchingusers',
+                               'credits',
+                               'copyright',
+                       ),
+                       'places' => array(
+                               'privacy',
+                               'about',
+                               'disclaimer',
+                       ),
+               ) );
+               
+               global $wgFooterIcons;
+               $tpl->set( 'footericons', $wgFooterIcons );
+               foreach ( $tpl->data["footericons"] as $footerIconsKey => &$footerIconsBlock ) {
+                       if ( count($footerIconsBlock) > 0 ) {
+                               foreach ( $footerIconsBlock as &$footerIcon ) {
+                                       if ( isset($footerIcon["src"]) ) {
+                                               if ( !isset($footerIcon["width"]) ) $footerIcon["width"] = 88;
+                                               if ( !isset($footerIcon["height"]) ) $footerIcon["height"] = 31;
+                                       }
+                               }
+                       } else {
+                               unset($tpl->data["footericons"][$footerIconsKey]);
+                       }
+               }
+
+               if ( $wgDebugComments ) {
+                       $tpl->setRef( 'debug', $out->mDebugtext );
+               } else {
+                       $tpl->set( 'debug', '' );
+               }
+
                $tpl->set( 'reporttime', wfReportTime() );
                $tpl->set( 'sitenotice', wfGetSiteNotice() );
-               $tpl->set( 'bottomscripts', $this->bottomScripts() );
+               $tpl->set( 'bottomscripts', $this->bottomScripts( $out ) );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
-               $out->mBodytext .= $printfooter ;
+               global $wgBetterDirectionality;
+               if ( $wgBetterDirectionality ) {
+                       $realBodyAttribs = array( 'lang' => $wgLanguageCode, 'dir' => $wgContLang->getDir() );
+                       $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
+               }
+               $out->mBodytext .= $printfooter . $this->generateDebugHTML();
                $tpl->setRef( 'bodytext', $out->mBodytext );
 
                # Language links
@@ -411,56 +467,56 @@ class SkinTemplate extends Skin {
                        foreach( $out->getLanguageLinks() as $l ) {
                                $tmp = explode( ':', $l, 2 );
                                $class = 'interwiki-' . $tmp[0];
-                               unset($tmp);
+                               unset( $tmp );
                                $nt = Title::newFromText( $l );
                                if ( $nt ) {
                                        $language_urls[] = array(
                                                'href' => $nt->getFullURL(),
-                                               'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+                                               'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
+                                                                       $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+                                               'title' => $nt->getText(),
                                                'class' => $class
                                        );
                                }
                        }
                }
-               if(count($language_urls)) {
-                       $tpl->setRef( 'language_urls', $language_urls);
+               if( count( $language_urls ) ) {
+                       $tpl->setRef( 'language_urls', $language_urls );
                } else {
-                       $tpl->set('language_urls', false);
+                       $tpl->set( 'language_urls', false );
                }
-               wfProfileOut( __METHOD__."-stuff4" );
+               wfProfileOut( __METHOD__ . '-stuff4' );
 
-               wfProfileIn( __METHOD__."-stuff5" );
+               wfProfileIn( __METHOD__ . '-stuff5' );
                # Personal toolbar
-               $tpl->set('personal_urls', $this->buildPersonalUrls());
+               $tpl->set( 'personal_urls', $this->buildPersonalUrls() );
                $content_actions = $this->buildContentActionUrls();
-               $tpl->setRef('content_actions', $content_actions);
+               $tpl->setRef( 'content_actions', $content_actions );
 
-               // XXX: attach this from javascript, same with section editing
-               if($this->iseditable && $wgUser->getOption("editondblclick") )
-               {
-                       $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
-                       $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
-               } else {
-                       $tpl->set('body_ondblclick', false);
-               }
-               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
+               // Set the head scripts near the end, in case the above actions resulted in added scripts
+               if ( $this->useHeadElement ) {
+                       $tpl->set( 'headelement', $out->headElement( $this ) );
+               } else {
+                       $tpl->set( 'headscripts', $out->getScript() );
+               }
+
                // original version by hansm
                if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
-                       wfDebug( __METHOD__ . ': Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!' );
+                       wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
                }
 
                // allow extensions adding stuff after the page content.
                // See Skin::afterContentHook() for further documentation.
-               $tpl->set ('dataAfterContent', $this->afterContentHook());
-               wfProfileOut( __METHOD__."-stuff5" );
+               $tpl->set( 'dataAfterContent', $this->afterContentHook() );
+               wfProfileOut( __METHOD__ . '-stuff5' );
 
                // execute template
-               wfProfileIn( __METHOD__."-execute" );
+               wfProfileIn( __METHOD__ . '-execute' );
                $res = $tpl->execute();
-               wfProfileOut( __METHOD__."-execute" );
+               wfProfileOut( __METHOD__ . '-execute' );
 
                // result may be an error
                $this->printOrError( $res );
@@ -472,7 +528,7 @@ class SkinTemplate extends Skin {
         * an error object of the appropriate type.
         * For the base class, assume strings all around.
         *
-        * @param mixed $str
+        * @param $str Mixed
         * @private
         */
        function printOrError( $str ) {
@@ -485,25 +541,42 @@ class SkinTemplate extends Skin {
         * @private
         */
        function buildPersonalUrls() {
-               global $wgTitle, $wgRequest;
+               global $wgOut, $wgRequest;
 
-               $pageurl = $wgTitle->getLocalURL();
+               $title = $wgOut->getTitle();
+               $pageurl = $title->getLocalURL();
                wfProfileIn( __METHOD__ );
 
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
-               if ($this->loggedin) {
+
+               # Due to bug 32276, if a user does not have read permissions, 
+               # $wgOut->getTitle() will just give Special:Badtitle, which is 
+               # not especially useful as a returnto parameter. Use the title 
+               # from the request instead, if there was one.
+               $page = Title::newFromURL( $wgRequest->getVal( 'title', '' ) );
+               $page = $wgRequest->getVal( 'returnto', $page );
+               $returnto = '';
+               if( strval( $page ) !== '' ) {
+                       $returnto = "returnto=$page";
+                       $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
+                       if( $query != '' ) {
+                               $returnto .= "&returntoquery=$query";
+                       }
+               }
+
+               if( $this->loggedin ) {
                        $personal_urls['userpage'] = array(
                                'text' => $this->username,
                                'href' => &$this->userpageUrlDetails['href'],
-                               'class' => $this->userpageUrlDetails['exists']?false:'new',
+                               'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
                                'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
                        );
-                       $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+                       $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
                        $personal_urls['mytalk'] = array(
-                               'text' => wfMsg('mytalk'),
+                               'text' => wfMsg( 'mytalk' ),
                                'href' => &$usertalkUrlDetails['href'],
-                               'class' => $usertalkUrlDetails['exists']?false:'new',
+                               'class' => $usertalkUrlDetails['exists'] ? false : 'new',
                                'active' => ( $usertalkUrlDetails['href'] == $pageurl )
                        );
                        $href = self::makeSpecialUrl( 'Preferences' );
@@ -524,10 +597,10 @@ class SkinTemplate extends Skin {
                        # from request values or be specified in "sub page" form. The plot
                        # thickens, because $wgTitle is altered for special pages, so doesn't
                        # contain the original alias-with-subpage.
-                       $title = Title::newFromText( $wgRequest->getText( 'title' ) );
-                       if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
+                       $origTitle = Title::newFromText( $wgRequest->getText( 'title' ) );
+                       if( $origTitle instanceof Title && $origTitle->getNamespace() == NS_SPECIAL ) {
                                list( $spName, $spPar ) =
-                                       SpecialPage::resolveAliasWithSubpage( $title->getText() );
+                                       SpecialPage::resolveAliasWithSubpage( $origTitle->getText() );
                                $active = $spName == 'Contributions'
                                        && ( ( $spPar && $spPar == $this->username )
                                                || $wgRequest->getText( 'target' ) == $this->username );
@@ -544,7 +617,9 @@ class SkinTemplate extends Skin {
                        $personal_urls['logout'] = array(
                                'text' => wfMsg( 'userlogout' ),
                                'href' => self::makeSpecialUrl( 'Userlogout',
-                                       $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
+                                       // userlogout link must always contain an & character, otherwise we might not be able
+                                       // to detect a buggy precaching proxy (bug 17790)
+                                       $title->isSpecial( 'Preferences' ) ? 'noreturnto' : $returnto
                                ),
                                'active' => false
                        );
@@ -553,43 +628,49 @@ class SkinTemplate extends Skin {
                        $loginlink = $wgUser->isAllowed( 'createaccount' )
                                ? 'nav-login-createaccount'
                                : 'login';
+
+                       # anonlogin & login are the same
+                       $login_url = array(
+                               'text' => wfMsg( $loginlink ),
+                               'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+                               'active' => $title->isSpecial( 'Userlogin' )
+                       );
+                       global $wgProto, $wgSecureLogin;
+                       if( $wgProto === 'http' && $wgSecureLogin ) {
+                               $title = SpecialPage::getTitleFor( 'Userlogin' );
+                               $https_url = preg_replace( '/^http:/', 'https:', $title->getFullURL() );
+                               $login_url['href']  = $https_url;
+                               $login_url['class'] = 'link-https';  # FIXME class depends on skin
+                       }
+
                        if( $this->showIPinHeader() ) {
                                $href = &$this->userpageUrlDetails['href'];
                                $personal_urls['anonuserpage'] = array(
                                        'text' => $this->username,
                                        'href' => $href,
-                                       'class' => $this->userpageUrlDetails['exists']?false:'new',
+                                       'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
                                        'active' => ( $pageurl == $href )
                                );
-                               $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+                               $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
                                $href = &$usertalkUrlDetails['href'];
                                $personal_urls['anontalk'] = array(
-                                       'text' => wfMsg('anontalk'),
+                                       'text' => wfMsg( 'anontalk' ),
                                        'href' => $href,
-                                       'class' => $usertalkUrlDetails['exists']?false:'new',
+                                       'class' => $usertalkUrlDetails['exists'] ? false : 'new',
                                        'active' => ( $pageurl == $href )
                                );
-                               $personal_urls['anonlogin'] = array(
-                                       'text' => wfMsg( $loginlink ),
-                                       'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
-                                       'active' => $wgTitle->isSpecial( 'Userlogin' )
-                               );
+                               $personal_urls['anonlogin'] = $login_url;
                        } else {
-
-                               $personal_urls['login'] = array(
-                                       'text' => wfMsg( $loginlink ),
-                                       'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
-                                       'active' => $wgTitle->isSpecial( 'Userlogin' )
-                               );
+                               $personal_urls['login'] = $login_url;
                        }
                }
 
-               wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
+               wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
                wfProfileOut( __METHOD__ );
                return $personal_urls;
        }
 
-       function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) {
+       function tabAction( $title, $message, $selected, $query = '', $checkEdit = false ) {
                $classes = array();
                if( $selected ) {
                        $classes[] = 'selected';
@@ -606,9 +687,9 @@ class SkinTemplate extends Skin {
                }
 
                $result = array();
-               if( !wfRunHooks('SkinTemplateTabAction', array(&$this,
+               if( !wfRunHooks( 'SkinTemplateTabAction', array( &$this,
                                $title, $message, $selected, $checkEdit,
-                               &$classes, &$query, &$text, &$result)) ) {
+                               &$classes, &$query, &$text, &$result ) ) ) {
                        return $result;
                }
 
@@ -620,14 +701,14 @@ class SkinTemplate extends Skin {
 
        function makeTalkUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
-               if( !is_object($title) ) {
-                       throw new MWException( __METHOD__." given invalid pagename $name" );
+               if( !is_object( $title ) ) {
+                       throw new MWException( __METHOD__ . " given invalid pagename $name" );
                }
                $title = $title->getTalkPage();
                self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 
@@ -637,7 +718,7 @@ class SkinTemplate extends Skin {
                self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 
@@ -647,16 +728,17 @@ class SkinTemplate extends Skin {
         * @private
         */
        function buildContentActionUrls() {
-               global $wgContLang, $wgLang, $wgOut;
+               global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
+
                wfProfileIn( __METHOD__ );
 
-               global $wgUser, $wgRequest;
-               $action = $wgRequest->getText( 'action' );
-               $section = $wgRequest->getText( 'section' );
+               $action = $wgRequest->getVal( 'action', 'view' );
+               $section = $wgRequest->getVal( 'section' );
                $content_actions = array();
+               $userCanRead = $this->mTitle->userCanRead();
 
-               $prevent_active_tabs = false ;
-               wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this , &$prevent_active_tabs ) )     ;
+               $prevent_active_tabs = false;
+               wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$prevent_active_tabs ) );
 
                if( $this->iscontent ) {
                        $subjpage = $this->mTitle->getSubjectPage();
@@ -667,56 +749,62 @@ class SkinTemplate extends Skin {
                                $subjpage,
                                $nskey,
                                !$this->mTitle->isTalkPage() && !$prevent_active_tabs,
-                               '', true);
+                               '', $userCanRead
+                       );
 
                        $content_actions['talk'] = $this->tabAction(
                                $talkpage,
                                'talk',
                                $this->mTitle->isTalkPage() && !$prevent_active_tabs,
                                '',
-                               true);
+                               $userCanRead
+                       );
 
-                       wfProfileIn( __METHOD__."-edit" );
-                       if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
+                       wfProfileIn( __METHOD__ . '-edit' );
+                       if ( $userCanRead && $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
                                $istalk = $this->mTitle->isTalkPage();
                                $istalkclass = $istalk?' istalk':'';
                                $content_actions['edit'] = array(
-                                       'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
-                                       'text' => $this->mTitle->exists()
+                                       'class' => ( ( ( $action == 'edit' or $action == 'submit' ) and $section != 'new' ) ? 'selected' : '' ) . $istalkclass,
+                                       'text' => ( $this->mTitle->exists() || ( $this->mTitle->getNamespace() == NS_MEDIAWIKI && !wfEmptyMsg( $this->mTitle->getText() ) ) )
                                                ? wfMsg( 'edit' )
                                                : wfMsg( 'create' ),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
 
-                               if ( $istalk || $wgOut->showNewSectionLink() ) {
-                                       $content_actions['addsection'] = array(
-                                               'class' => $section == 'new'?'selected':false,
-                                               'text' => wfMsg('addsection'),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
-                                       );
+                               // adds new section link if page is a current revision of a talk page or
+                               if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
+                                       if ( !$wgOut->forceHideNewSectionLink() ) {
+                                               $content_actions['addsection'] = array(
+                                                       'class' => $section == 'new' ? 'selected' : false,
+                                                       'text' => wfMsg( 'addsection' ),
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
+                                               );
+                                       }
                                }
-                       } elseif ( $this->mTitle->isKnown() ) {
+                       } elseif ( $this->mTitle->hasSourceText() && $userCanRead ) {
                                $content_actions['viewsource'] = array(
                                        'class' => ($action == 'edit') ? 'selected' : false,
-                                       'text' => wfMsg('viewsource'),
+                                       'text' => wfMsg( 'viewsource' ),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
                        }
-                       wfProfileOut( __METHOD__."-edit" );
+                       wfProfileOut( __METHOD__ . '-edit' );
 
-                       wfProfileIn( __METHOD__."-live" );
-                       if ( $this->mTitle->exists() ) {
+                       wfProfileIn( __METHOD__ . '-live' );
+                       if ( $this->mTitle->exists() && $userCanRead ) {
 
                                $content_actions['history'] = array(
                                        'class' => ($action == 'history') ? 'selected' : false,
-                                       'text' => wfMsg('history_short'),
-                                       'href' => $this->mTitle->getLocalUrl( 'action=history')
+                                       'text' => wfMsg( 'history_short' ),
+                                       'href' => $this->mTitle->getLocalUrl( 'action=history' ),
+                                       'rel' => 'archives',
                                );
 
-                               if( $wgUser->isAllowed('delete') ) {
+                               if( $wgUser->isAllowed( 'delete' ) ) {
                                        $content_actions['delete'] = array(
                                                'class' => ($action == 'delete') ? 'selected' : false,
-                                               'text' => wfMsg('delete'),
+                                               'text' => wfMsg( 'delete' ),
                                                'href' => $this->mTitle->getLocalUrl( 'action=delete' )
                                        );
                                }
@@ -724,7 +812,7 @@ class SkinTemplate extends Skin {
                                        $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
                                        $content_actions['move'] = array(
                                                'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
-                                               'text' => wfMsg('move'),
+                                               'text' => wfMsg( 'move' ),
                                                'href' => $moveTitle->getLocalUrl()
                                        );
                                }
@@ -733,26 +821,27 @@ class SkinTemplate extends Skin {
                                        if( !$this->mTitle->isProtected() ){
                                                $content_actions['protect'] = array(
                                                        'class' => ($action == 'protect') ? 'selected' : false,
-                                                       'text' => wfMsg('protect'),
+                                                       'text' => wfMsg( 'protect' ),
                                                        'href' => $this->mTitle->getLocalUrl( 'action=protect' )
                                                );
 
                                        } else {
                                                $content_actions['unprotect'] = array(
                                                        'class' => ($action == 'unprotect') ? 'selected' : false,
-                                                       'text' => wfMsg('unprotect'),
+                                                       'text' => wfMsg( 'unprotect' ),
                                                        'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
                                                );
                                        }
                                }
                        } else {
                                //article doesn't exist or is deleted
-                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) {
-                                       if( $n = $this->mTitle->isDeleted() ) {
+                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'deletedtext' ) ) {
+                                       $n = $this->mTitle->isDeleted();
+                                       if( $n ) {
                                                $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
                                                $content_actions['undelete'] = array(
                                                        'class' => false,
-                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum($n) ),
+                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum( $n ) ),
                                                        'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
                                                        #'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
                                                );
@@ -763,40 +852,40 @@ class SkinTemplate extends Skin {
                                        if( !$this->mTitle->getRestrictions( 'create' ) ) {
                                                $content_actions['protect'] = array(
                                                        'class' => ($action == 'protect') ? 'selected' : false,
-                                                       'text' => wfMsg('protect'),
+                                                       'text' => wfMsg( 'protect' ),
                                                        'href' => $this->mTitle->getLocalUrl( 'action=protect' )
                                                );
 
                                        } else {
                                                $content_actions['unprotect'] = array(
                                                        'class' => ($action == 'unprotect') ? 'selected' : false,
-                                                       'text' => wfMsg('unprotect'),
+                                                       'text' => wfMsg( 'unprotect' ),
                                                        'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
                                                );
                                        }
                                }
                        }
 
-                       wfProfileOut( __METHOD__."-live" );
+                       wfProfileOut( __METHOD__ . '-live' );
 
                        if( $this->loggedin ) {
                                if( !$this->mTitle->userIsWatching()) {
                                        $content_actions['watch'] = array(
                                                'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
-                                               'text' => wfMsg('watch'),
+                                               'text' => wfMsg( 'watch' ),
                                                'href' => $this->mTitle->getLocalUrl( 'action=watch' )
                                        );
                                } else {
                                        $content_actions['unwatch'] = array(
                                                'class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
-                                               'text' => wfMsg('unwatch'),
+                                               'text' => wfMsg( 'unwatch' ),
                                                'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
                                        );
                                }
                        }
 
 
-                       wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) )   ;
+                       wfRunHooks( 'SkinTemplateTabs', array( $this, &$content_actions ) );
                } else {
                        /* show special page tab */
 
@@ -821,10 +910,10 @@ class SkinTemplate extends Skin {
                                        continue;
                                $selected = ( $code == $preferred )? 'selected' : false;
                                $content_actions['varlang-' . $vcount] = array(
-                                               'class' => $selected,
-                                               'text' => $varname,
-                                               'href' => $this->mTitle->getLocalURL('',$code)
-                                       );
+                                       'class' => $selected,
+                                       'text' => $varname,
+                                       'href' => $this->mTitle->getLocalURL( '', $code )
+                               );
                                $vcount ++;
                        }
                }
@@ -835,34 +924,27 @@ class SkinTemplate extends Skin {
                return $content_actions;
        }
 
-
-
        /**
         * build array of common navigation links
         * @return array
         * @private
         */
        function buildNavUrls() {
-               global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
-               global $wgEnableUploads, $wgUploadNavigationUrl;
+               global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
+               global $wgUploadNavigationUrl;
 
                wfProfileIn( __METHOD__ );
 
-               $action = $wgRequest->getText( 'action' );
+               $action = $wgRequest->getVal( 'action', 'view' );
 
                $nav_urls = array();
                $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
-               if( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
-                       if ($wgUploadNavigationUrl) {
-                               $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
-                       } else {
-                               $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
-                       }
+               if( $wgUploadNavigationUrl ) {
+                       $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
+               } elseif( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
+                       $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
                } else {
-                       if ($wgUploadNavigationUrl)
-                               $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
-                       else
-                               $nav_urls['upload'] = false;
+                       $nav_urls['upload'] = false;
                }
                $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
 
@@ -871,17 +953,19 @@ class SkinTemplate extends Skin {
 
                // A print stylesheet is attached to all pages, but nobody ever
                // figures that out. :)  Add a link...
-               if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
-                       $nav_urls['print'] = array(
-                               'text' => wfMsg( 'printableversion' ),
-                               'href' => $wgRequest->appendQuery( 'printable=yes' )
-                       );
+               if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
+                       if ( !$wgOut->isPrintable() ) {
+                               $nav_urls['print'] = array(
+                                       'text' => wfMsg( 'printableversion' ),
+                                       'href' => $wgRequest->appendQuery( 'printable=yes' )
+                               );
+                       }
 
                        // Also add a "permalink" while we're at it
                        if ( $this->mRevisionId ) {
                                $nav_urls['permalink'] = array(
                                        'text' => wfMsg( 'permalink' ),
-                                       'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
+                                       'href' => $wgOut->getTitle()->getLocalURL( "oldid=$this->mRevisionId" )
                                );
                        }
 
@@ -903,36 +987,42 @@ class SkinTemplate extends Skin {
                        } else {
                                $nav_urls['recentchangeslinked'] = false;
                        }
-                       if ($wgUseTrackbacks)
+                       if( $wgUseTrackbacks )
                                $nav_urls['trackbacklink'] = array(
-                                       'href' => $wgTitle->trackbackURL()
+                                       'href' => $wgOut->getTitle()->trackbackURL()
                                );
                }
 
                if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
-                       $id = User::idFromName($this->mTitle->getText());
-                       $ip = User::isIP($this->mTitle->getText());
+                       $rootUser = strtok( $this->mTitle->getText(), '/' );
+                       $id = User::idFromName( $rootUser );
+                       $ip = User::isIP( $rootUser );
                } else {
                        $id = 0;
                        $ip = false;
                }
 
-               if($id || $ip) { # both anons and non-anons have contribs list
+               if( $id || $ip ) { # both anons and non-anons have contribs list
                        $nav_urls['contributions'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
                        );
 
                        if( $id ) {
                                $logPage = SpecialPage::getTitleFor( 'Log' );
-                               $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
-                                       . $this->mTitle->getPartialUrl() ) );
+                               $nav_urls['log'] = array(
+                                       'href' => $logPage->getLocalUrl(
+                                               array(
+                                                       'user' => $rootUser
+                                               )
+                                       )
+                               );
                        } else {
                                $nav_urls['log'] = false;
                        }
 
                        if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
+                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $rootUser )
                                );
                        } else {
                                $nav_urls['blockip'] = false;
@@ -945,7 +1035,7 @@ class SkinTemplate extends Skin {
                $nav_urls['emailuser'] = false;
                if( $this->showEmailUser( $id ) ) {
                        $nav_urls['emailuser'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser )
                        );
                }
                wfProfileOut( __METHOD__ );
@@ -965,17 +1055,17 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupUserJs( $allowUserJs ) {
+               global $wgRequest, $wgJsMimeType;
                wfProfileIn( __METHOD__ );
 
-               global $wgRequest, $wgJsMimeType;
-               $action = $wgRequest->getText('action');
+               $action = $wgRequest->getVal( 'action', 'view' );
 
                if( $allowUserJs && $this->loggedin ) {
                        if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
                                # XXX: additional security check/prompt?
-                               $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
+                               $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText( 'wpTextbox1' ) . ' /*]]>*/';
                        } else {
-                               $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType);
+                               $this->userjs = self::makeUrl( $this->userpage . '/' . $this->skinname . '.js', 'action=raw&ctype=' . $wgJsMimeType );
                        }
                }
                wfProfileOut( __METHOD__ );
@@ -994,6 +1084,10 @@ class SkinTemplate extends Skin {
                wfProfileOut( __METHOD__ );
                return $out;
        }
+
+       public function commonPrintStylesheet() {
+               return false;
+       }
 }
 
 /**
@@ -1001,43 +1095,44 @@ class SkinTemplate extends Skin {
  * compatible with what we use of PHPTAL 0.7.
  * @ingroup Skins
  */
-class QuickTemplate {
+abstract class QuickTemplate {
        /**
-        * @public
+        * Constructor
         */
-       function QuickTemplate() {
+       public function QuickTemplate() {
                $this->data = array();
                $this->translator = new MediaWiki_I18N();
        }
 
        /**
-        * @public
+        * Sets the value $value to $name
+        * @param $name
+        * @param $value
         */
-       function set( $name, $value ) {
+       public function set( $name, $value ) {
                $this->data[$name] = $value;
        }
 
        /**
-        * @public
+        * @param $name
+        * @param $value
         */
-       function setRef($name, &$value) {
+       public function setRef( $name, &$value ) {
                $this->data[$name] =& $value;
        }
 
        /**
-        * @public
+        * @param $t
         */
-       function setTranslator( &$t ) {
+       public function setTranslator( &$t ) {
                $this->translator = &$t;
        }
 
        /**
-        * @public
+        * Main function, used by classes that subclass QuickTemplate
+        * to show the actual HTML output
         */
-       function execute() {
-               echo "Override this function.";
-       }
-
+       abstract public function execute();
 
        /**
         * @private
@@ -1079,10 +1174,10 @@ class QuickTemplate {
         * @private
         */
        function msgWiki( $str ) {
-               global $wgParser, $wgTitle, $wgOut;
+               global $wgParser, $wgOut;
 
                $text = $this->translator->translate( $str );
-               $parserOutput = $wgParser->parse( $text, $wgTitle,
+               $parserOutput = $wgParser->parse( $text, $wgOut->getTitle(),
                        $wgOut->parserOptions(), true );
                echo $parserOutput->getText();
        }
@@ -1099,6 +1194,6 @@ class QuickTemplate {
         */
        function haveMsg( $str ) {
                $msg = $this->translator->translate( $str );
-               return ($msg != '-') && ($msg != ''); # ????
+               return ( $msg != '-' ) && ( $msg != '' ); # ????
        }
 }