Fix r78970 per CR: params were the wrong way around
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 82574cd..f44bca3 100644 (file)
@@ -1,21 +1,28 @@
 <?php
-if ( ! defined( 'MEDIAWIKI' ) )
-       die( 1 );
+/**
+ * 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
+ */
 
-# 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
+if ( !defined( 'MEDIAWIKI' ) ) {
+       die( 1 );
+}
 
 /**
  * Wrapper object for MediaWiki's localization functions,
@@ -70,38 +77,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,16 +108,15 @@ 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' ) );
        }
-       
+
        /**
         * Create the template engine object; we feed it a bunch of data
         * 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
@@ -135,16 +133,19 @@ class SkinTemplate extends Skin {
         */
        function outputPage( OutputPage $out ) {
                global $wgArticle, $wgUser, $wgLang, $wgContLang;
-               global $wgScript, $wgStylePath, $wgContLanguageCode;
+               global $wgScript, $wgStylePath, $wgLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
-               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
+               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version;
                global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
-               global $wgUseTrackbacks, $wgUseSiteJs;
-               global $wgArticlePath, $wgScriptPath, $wgServer, $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' );
@@ -164,9 +165,14 @@ class SkinTemplate extends Skin {
                wfProfileIn( __METHOD__ . '-stuff' );
                $this->thispage = $this->mTitle->getPrefixedDBkey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
-               $query = $wgRequest->data;
-               unset( $query['title'] );
-               $this->thisquery = wfArrayToCGI( $query );
+               $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' ) );
@@ -180,12 +186,49 @@ 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' );
 
+               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 );
+                       }
+
+                       $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
+                       $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
+                       $tpl->set( 'html5version', $wgHtml5Version );
+                       $tpl->set( 'headlinks', $out->getHeadLinks( $this ) );
+                       $tpl->set( 'csslinks', $out->buildCssLinks() );
+
+                       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() );
@@ -193,8 +236,8 @@ class SkinTemplate extends Skin {
                $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
                $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
 
-               $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
-                                       $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
+               $nsname = MWNamespace::exists( $this->mTitle->getNamespace() ) ?
+                                       MWNamespace::getCanonicalName( $this->mTitle->getNamespace() ) :
                                        $this->mTitle->getNsText();
 
                $tpl->set( 'nscanonical', $nsname );
@@ -210,13 +253,13 @@ class SkinTemplate extends Skin {
                $subpagestr = $this->subPageSubtitle();
                $tpl->set(
                        'subtitle', !empty( $subpagestr ) ?
-                       '<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle() :
+                       '<span class="subpages">' . $subpagestr . '</span>' . $out->getSubtitle() :
                        $out->getSubtitle()
                );
                $undelete = $this->getUndeleteLink();
                $tpl->set(
                        'undelete', !empty( $undelete ) ?
-                       '<span class="subpages">'.$undelete.'</span>' :
+                       '<span class="subpages">' . $undelete . '</span>' :
                        ''
                );
 
@@ -233,34 +276,24 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set( 'feeds', false );
                }
-               if( $wgUseTrackbacks && $out->isArticleRelated() ) {
-                       $tpl->set( 'trackbackhtml', $out->getTitle()->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 );
                /* XXX currently unused, might get useful later
-               $tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
-               $tpl->set( "exists", $this->mTitle->getArticleID() != 0 );
-               $tpl->set( "watch", $this->mTitle->userIsWatching() ? "unwatch" : "watch" );
-               $tpl->set( "protect", count($this->mTitle->isProtected()) ? "unprotect" : "protect" );
-               $tpl->set( "helppage", wfMsg('helppage'));
+               $tpl->set( 'editable', ( $this->mTitle->getNamespace() != NS_SPECIAL ) );
+               $tpl->set( 'exists', $this->mTitle->getArticleID() != 0 );
+               $tpl->set( 'watch', $this->mTitle->userIsWatching() ? 'unwatch' : 'watch' );
+               $tpl->set( 'protect', count( $this->mTitle->isProtected() ) ? 'unprotect' : 'protect' );
+               $tpl->set( 'helppage', wfMsg( 'helppage' ) );
                */
                $tpl->set( 'searchaction', $this->escapeSearchLink() );
                $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBKey() );
@@ -270,84 +303,49 @@ class SkinTemplate extends Skin {
                $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() );
+
+               $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( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
                $tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
-               $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
+               $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( 'userlangattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $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();
+               // 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', '' );
 
-               if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-                       $usertitle = $this->mUser->getUserPage();
-                       $usertalktitle = $usertitle->getTalkPage();
+               $lang = $wgLang->getCode();
+               $dir  = $wgLang->getDir();
+               if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
+                       $attrs = " lang='$lang' dir='$dir'";
 
-                       if( !$usertalktitle->equals( $this->mTitle ) ) {
-                               $newmessageslink = $this->link(
-                                       $usertalktitle,
-                                       wfMsgHtml( 'newmessageslink' ),
-                                       array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
-                               );
-
-                               $newmessagesdifflink = $this->link(
-                                       $usertalktitle,
-                                       wfMsgHtml( 'newmessagesdifflink' ),
-                                       array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
-                               );
+                       $tpl->set( 'userlangattributes', $attrs );
 
-                               $ntl = wfMsg(
-                                       'youhavenewmessages',
-                                       $newmessageslink,
-                                       $newmessagesdifflink
-                               );
-                               # Disable Cache
-                               $out->setSquidMaxage( 0 );
-                       }
-               } else if( count( $newtalks ) ) {
-                       // _>" " for BC <= 1.16
-                       $sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
-                       $msgs = array();
-                       foreach( $newtalks as $newtalk ) {
-                               $msgs[] = Xml::element('a',
-                                       array( 'href' => $newtalk['link'] ), $newtalk['wiki'] );
+                       // 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 = '';
                }
+
+               $newtalks = $this->getNewtalks();
+
                wfProfileOut( __METHOD__ . '-stuff2' );
 
                wfProfileIn( __METHOD__ . '-stuff3' );
-               $tpl->setRef( 'newtalk', $ntl );
+               $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() && ( !isset( $oldid ) || isset( $diff ) ) &&
+                       $wgArticle && 0 != $wgArticle->getID() ){
                        if ( !$wgDisableCounters ) {
                                $viewcount = $wgLang->formatNum( $wgArticle->getCount() );
                                if ( $viewcount ) {
@@ -361,7 +359,6 @@ class SkinTemplate extends Skin {
 
                        if( $wgPageShowWatchingUsers ) {
                                $dbr = wfGetDB( DB_SLAVE );
-                               $watchlist = $dbr->tableName( 'watchlist' );
                                $res = $dbr->select( 'watchlist',
                                        array( 'COUNT(*) AS n' ),
                                        array( 'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ), 'wl_namespace' => $this->mTitle->getNamespace() ),
@@ -415,12 +412,56 @@ class SkinTemplate extends Skin {
                $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";
+               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 );
 
@@ -438,6 +479,7 @@ class SkinTemplate extends Skin {
                                                'href' => $nt->getFullURL(),
                                                'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
                                                                        $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+                                               'title' => $nt->getText(),
                                                'class' => $class
                                        );
                                }
@@ -456,17 +498,16 @@ class SkinTemplate extends Skin {
                $content_actions = $this->buildContentActionUrls();
                $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!\n" );
@@ -492,13 +533,26 @@ 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 ) {
                echo $str;
        }
 
+       /**
+        * Output a boolean indiciating if buildPersonalUrls should output separate
+        * login and create account links or output a combined link
+        * By default we simply return a global config setting that affects most skins
+        * This is setup as a method so that like with $wgLogo and getLogo() a skin
+        * can override this setting and always output one or the other if it has
+        * a reason it can't output one of the two modes.
+        */
+       function useCombinedLoginLink() {
+               global $wgUseCombinedLoginLink;
+               return $wgUseCombinedLoginLink;
+       }
+
        /**
         * build array of urls for personal toolbar
         * @return array
@@ -513,6 +567,12 @@ class SkinTemplate extends Skin {
 
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
+               $page = $wgRequest->getVal( 'returnto', $this->thisurl );
+               $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
+               $returnto = "returnto=$page";
+               if( $this->thisquery != '' ) {
+                       $returnto .= "&returntoquery=$query";
+               }
                if( $this->loggedin ) {
                        $personal_urls['userpage'] = array(
                                'text' => $this->username,
@@ -565,15 +625,45 @@ class SkinTemplate extends Skin {
                        $personal_urls['logout'] = array(
                                'text' => wfMsg( 'userlogout' ),
                                'href' => self::makeSpecialUrl( 'Userlogout',
-                                       $title->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}&returntoquery={$this->thisquery}"
+                                       $title->isSpecial( 'Preferences' ) ? '' : $returnto
                                ),
                                'active' => false
                        );
                } else {
                        global $wgUser;
-                       $loginlink = $wgUser->isAllowed( 'createaccount' )
+                       $useCombinedLoginLink = $this->useCombinedLoginLink();
+                       $loginlink = $wgUser->isAllowed( 'createaccount' ) && $useCombinedLoginLink
                                ? 'nav-login-createaccount'
                                : 'login';
+                       $is_signup = $wgRequest->getText('type') == "signup";
+
+                       # anonlogin & login are the same
+                       $login_url = array(
+                               'text' => wfMsg( $loginlink ),
+                               'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+                               'active' => $title->isSpecial( 'Userlogin' ) && ( $loginlink == "nav-login-createaccount" || !$is_signup )
+                       );
+                       if ( $wgUser->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) {
+                               $createaccount_url = array(
+                                       'text' => wfMsg( 'createaccount' ),
+                                       'href' => self::makeSpecialUrl( 'Userlogin', "$returnto&type=signup" ),
+                                       'active' => $title->isSpecial( 'Userlogin' ) && $is_signup
+                               );
+                       }
+                       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 ( isset($createaccount_url) ) {
+                                       $https_url = preg_replace( '/^http:/', 'https:', $title->getFullURL("type=signup") );
+                                       $createaccount_url['href']  = $https_url;
+                                       $createaccount_url['class'] = 'link-https';  # FIXME class depends on skin
+                               }
+                       }
+                       
+
                        if( $this->showIPinHeader() ) {
                                $href = &$this->userpageUrlDetails['href'];
                                $personal_urls['anonuserpage'] = array(
@@ -590,20 +680,15 @@ class SkinTemplate extends Skin {
                                        'class' => $usertalkUrlDetails['exists'] ? false : 'new',
                                        'active' => ( $pageurl == $href )
                                );
-                               $personal_urls['anonlogin'] = array(
-                                       'text' => wfMsg( $loginlink ),
-                                       'href' => self::makeSpecialUrl( 'Userlogin', "returnto={$this->thisurl}&returntoquery={$this->thisquery}" ),
-                                       'active' => $title->isSpecial( 'Userlogin' )
-                               );
+                               $personal_urls['anonlogin'] = $login_url;
+                               if ( isset($createaccount_url) ) {
+                                       $personal_urls['createaccount'] = $createaccount_url;
+                               }
                        } else {
-                               $personal_urls['login'] = array(
-                                       'text' => wfMsg( $loginlink ),
-                                       'href' => self::makeSpecialUrl( 'Userlogin', "returnto={$this->thisurl}&returntoquery={$this->thisquery}" ),
-                                       'active' => $title->isSpecial( 'Userlogin' )
-                               );
+                               $personal_urls['login'] = $login_url;
                        }
                }
-               
+
                wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
                wfProfileOut( __METHOD__ );
                return $personal_urls;
@@ -647,7 +732,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,
                );
        }
 
@@ -657,7 +742,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,
                );
        }
 
@@ -674,6 +759,7 @@ class SkinTemplate extends Skin {
                $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 ) );
@@ -687,7 +773,7 @@ class SkinTemplate extends Skin {
                                $subjpage,
                                $nskey,
                                !$this->mTitle->isTalkPage() && !$prevent_active_tabs,
-                               '', true
+                               '', $userCanRead
                        );
 
                        $content_actions['talk'] = $this->tabAction(
@@ -695,32 +781,32 @@ class SkinTemplate extends Skin {
                                'talk',
                                $this->mTitle->isTalkPage() && !$prevent_active_tabs,
                                '',
-                               true
+                               $userCanRead
                        );
 
                        wfProfileIn( __METHOD__ . '-edit' );
-                       if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
+                       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()
+                                       'text' => ( $this->mTitle->exists() || ( $this->mTitle->getNamespace() == NS_MEDIAWIKI && !wfEmptyMsg( $this->mTitle->getText() ) ) )
                                                ? wfMsg( 'edit' )
                                                : wfMsg( 'create' ),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
 
-                               // adds new section link if page is a current revision of a talk page or 
+                               // 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' ),
@@ -730,7 +816,7 @@ class SkinTemplate extends Skin {
                        wfProfileOut( __METHOD__ . '-edit' );
 
                        wfProfileIn( __METHOD__ . '-live' );
-                       if ( $this->mTitle->exists() ) {
+                       if ( $this->mTitle->exists() && $userCanRead ) {
 
                                $content_actions['history'] = array(
                                        'class' => ($action == 'history') ? 'selected' : false,
@@ -773,8 +859,9 @@ class SkinTemplate extends Skin {
                                }
                        } 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,
@@ -822,7 +909,7 @@ class SkinTemplate extends Skin {
                        }
 
 
-                       wfRunHooks( 'SkinTemplateTabs', array( &$this, &$content_actions ) );
+                       wfRunHooks( 'SkinTemplateTabs', array( $this, &$content_actions ) );
                } else {
                        /* show special page tab */
 
@@ -868,7 +955,7 @@ class SkinTemplate extends Skin {
         */
        function buildNavUrls() {
                global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
-               global $wgEnableUploads, $wgUploadNavigationUrl;
+               global $wgUploadNavigationUrl;
 
                wfProfileIn( __METHOD__ );
 
@@ -878,7 +965,7 @@ class SkinTemplate extends Skin {
                $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
                if( $wgUploadNavigationUrl ) {
                        $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
-               } elseif( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
+               } elseif( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
                        $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
                } else {
                        $nav_urls['upload'] = false;
@@ -891,7 +978,7 @@ 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 == 'view' || $action == 'purge' ) ) {
-                       if ( !$wgRequest->getBool( 'printable' ) ) {
+                       if ( !$wgOut->isPrintable() ) {
                                $nav_urls['print'] = array(
                                        'text' => wfMsg( 'printableversion' ),
                                        'href' => $wgRequest->appendQuery( 'printable=yes' )
@@ -931,8 +1018,9 @@ class SkinTemplate extends Skin {
                }
 
                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;
@@ -940,7 +1028,7 @@ class SkinTemplate extends Skin {
 
                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 ) {
@@ -948,7 +1036,7 @@ class SkinTemplate extends Skin {
                                $nav_urls['log'] = array(
                                        'href' => $logPage->getLocalUrl(
                                                array(
-                                                       'user' => $this->mTitle->getText()
+                                                       'user' => $rootUser
                                                )
                                        )
                                );
@@ -958,7 +1046,7 @@ class SkinTemplate extends Skin {
 
                        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;
@@ -971,7 +1059,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__ );
@@ -992,7 +1080,6 @@ class SkinTemplate extends Skin {
         */
        function setupUserJs( $allowUserJs ) {
                global $wgRequest, $wgJsMimeType;
-
                wfProfileIn( __METHOD__ );
 
                $action = $wgRequest->getVal( 'action', 'view' );
@@ -1032,7 +1119,7 @@ class SkinTemplate extends Skin {
  * compatible with what we use of PHPTAL 0.7.
  * @ingroup Skins
  */
-class QuickTemplate {
+abstract class QuickTemplate {
        /**
         * Constructor
         */
@@ -1069,9 +1156,7 @@ class QuickTemplate {
         * Main function, used by classes that subclass QuickTemplate
         * to show the actual HTML output
         */
-       public function execute() {
-               echo 'Override this function.';
-       }
+       abstract public function execute();
 
        /**
         * @private
@@ -1136,3 +1221,335 @@ class QuickTemplate {
                return ( $msg != '-' ) && ( $msg != '' ); # ????
        }
 }
+
+/**
+ * New base template for a skin's template extended from QuickTemplate
+ * this class features helper methods that provide common ways of interacting
+ * with the data stored in the QuickTemplate
+ */
+abstract class BaseTemplate extends QuickTemplate {
+
+       /**
+        * Create an array of common toolbox items from the data in the quicktemplate
+        * stored by SkinTemplate.
+        * The resulting array is built acording to a format intended to be passed
+        * through makeListItem to generate the html.
+        */
+       function getToolbox() {
+               wfProfileIn( __METHOD__ );
+
+               $toolbox = array();
+               if ( $this->data['notspecialpage'] ) {
+                       $toolbox['whatlinkshere'] = $this->data['nav_urls']['whatlinkshere'];
+                       $toolbox['whatlinkshere']['id'] = 't-whatlinkshere';
+                       if ( $this->data['nav_urls']['recentchangeslinked'] ) {
+                               $toolbox['recentchangeslinked'] = $this->data['nav_urls']['recentchangeslinked'];
+                               $toolbox['recentchangeslinked']['msg'] = 'recentchangeslinked-toolbox';
+                               $toolbox['recentchangeslinked']['id'] = 't-recentchangeslinked';
+                       }
+               }
+               if( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) {
+                       $toolbox['trackbacklink'] = $this->data['nav_urls']['trackbacklink'];
+                       $toolbox['trackbacklink']['id'] = 't-trackbacklink';
+               }
+               if ( $this->data['feeds'] ) {
+                       $toolbox['feeds']['id'] = 'feedlinks';
+                       $toolbox['feeds']['links'] = array();
+                       foreach ( $this->data['feeds'] as $key => $feed ) {
+                               $toolbox['feeds']['links'][$key] = $feed;
+                               $toolbox['feeds']['links'][$key]['id'] = "feed-$key";
+                               $toolbox['feeds']['links'][$key]['rel'] = 'alternate';
+                               $toolbox['feeds']['links'][$key]['type'] = "application/{$key}+xml";
+                               $toolbox['feeds']['links'][$key]['class'] = 'feedlink';
+                       }
+               }
+               foreach ( array( 'contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages' ) as $special ) {
+                       if ( $this->data['nav_urls'][$special] ) {
+                               $toolbox[$special] = $this->data['nav_urls'][$special];
+                               $toolbox[$special]['id'] = "t-$special";
+                       }
+               }
+               if ( !empty( $this->data['nav_urls']['print']['href'] ) ) {
+                       $toolbox['print'] = $this->data['nav_urls']['print'];
+                       $toolbox['print']['rel'] = 'alternate';
+                       $toolbox['print']['msg'] = 'printableversion';
+               }
+               if ( !empty( $this->data['nav_urls']['permalink']['href'] ) ) {
+                       $toolbox['permalink'] = $this->data['nav_urls']['permalink'];
+                       $toolbox['permalink']['id'] = 't-permalink';
+               } elseif ( $this->data['nav_urls']['permalink']['href'] === '' ) {
+                       $toolbox['permalink'] = $this->data['nav_urls']['permalink'];
+                       unset( $toolbox['permalink']['href'] );
+                       $toolbox['ispermalink']['tooltiponly'] = true;
+                       $toolbox['ispermalink']['id'] = 't-ispermalink';
+                       $toolbox['ispermalink']['msg'] = 'permalink';
+               }
+               wfRunHooks( 'BaseTemplateToolbox', array( &$this, &$toolbox ) );
+               wfProfileOut( __METHOD__ );
+               return $toolbox;
+       }
+
+       /**
+        * Create an array of personal tools items from the data in the quicktemplate
+        * stored by SkinTemplate.
+        * The resulting array is built acording to a format intended to be passed
+        * through makeListItem to generate the html.
+        * This is in reality the same list as already stored in personal_urls
+        * however it is reformatted so that you can just pass the individual items
+        * to makeListItem instead of hardcoding the element creation boilerplate.
+        */
+       function getPersonalTools() {
+               $personal_tools = array();
+               foreach( $this->data['personal_urls'] as $key => $ptool ) {
+                       # The class on a personal_urls item is meant to go on the <a> instead
+                       # of the <li> so we have to use a single item "links" array instead
+                       # of using most of the personal_url's keys directly
+                       $personal_tools[$key] = array();
+                       $personal_tools[$key]["links"][] = array();
+                       $personal_tools[$key]["links"][0]["single-id"] = $personal_tools[$key]["id"] = "pt-$key";
+                       if ( isset($ptool["active"]) ) {
+                               $personal_tools[$key]["active"] = $ptool["active"];
+                       }
+                       foreach ( array("href", "class", "text") as $k ) {
+                               if ( isset($ptool[$k]) )
+                                       $personal_tools[$key]["links"][0][$k] = $ptool[$k];
+                       }
+               }
+               return $personal_tools;
+       }
+
+       /**
+        * Makes a link, usually used by makeListItem to generate a link for an item
+        * in a list used in navigation lists, portlets, portals, sidebars, etc...
+        *
+        * $key is a string, usually a key from the list you are generating this link from
+        * $item is an array containing some of a specific set of keys.
+        * The text of the link will be generated either from the contents of the "text"
+        * key in the $item array, if a "msg" key is present a message by that name will
+        * be used, and if neither of those are set the $key will be used as a message name.
+        * If a "href" key is not present makeLink will just output htmlescaped text.
+        * The href, id, class, rel, and type keys are used as attributes for the link if present.
+        * If an "id" or "single-id" (if you don't want the actual id to be output on the link)
+        * is present it will be used to generate a tooltip and accesskey for the link.
+        * If you don't want an accesskey, set $item['tooltiponly'] = true;
+        */
+       function makeLink( $key, $item ) {
+               if ( isset( $item['text'] ) ) {
+                       $text = $item['text'];
+               } else {
+                       $text = $this->translator->translate( isset( $item['msg'] ) ? $item['msg'] : $key );
+               }
+
+               if ( !isset( $item['href'] ) ) {
+                       return htmlspecialchars( $text );
+               }
+
+               $attrs = array();
+               foreach ( array( 'href', 'id', 'class', 'rel', 'type' ) as $attr ) {
+                       if ( isset( $item[$attr] ) ) {
+                               $attrs[$attr] = $item[$attr];
+                       }
+               }
+
+               if ( isset( $item['id'] ) ) {
+                       $item['single-id'] = $item['id'];
+               }
+               if ( isset( $item['single-id'] ) ) {
+                       if ( isset( $item['tooltiponly'] ) && $item['tooltiponly'] ) {
+                               $attrs['title'] = $this->skin->titleAttrib( $item['single-id'] );
+                               if ( $attrs['title'] === false ) {
+                                       unset( $attrs['title'] );
+                               }
+                       } else {
+                               $attrs = array_merge(
+                                       $attrs,
+                                       $this->skin->tooltipAndAccesskeyAttribs( $item['single-id'] )
+                               );
+                       }
+               }
+
+               return Html::element( 'a', $attrs, $text );
+       }
+
+       /**
+        * Generates a list item for a navigation, portlet, portal, sidebar... etc list
+        * $key is a string, usually a key from the list you are generating this link from
+        * $item is an array of list item data containing some of a specific set of keys.
+        * The "id" and "class" keys will be used as attributes for the list item,
+        * if "active" contains a value of true a "active" class will also be appended to class.
+        * If you want something other than a <li> you can pass a tag name such as
+        * "tag" => "span" in the $options array to change the tag used.
+        * link/content data for the list item may come in one of two forms
+        * A "links" key may be used, in which case it should contain an array with
+        * a list of links to include inside the list item, see makeLink for the format
+        * of individual links array items.
+        * Otherwise the relevant keys from the list item $item array will be passed
+        * to makeLink instead. Note however that "id" and "class" are used by the
+        * list item directly so they will not be passed to makeLink
+        * (however the link will still support a tooltip and accesskey from it)
+        * If you need an id or class on a single link you should include a "links"
+        * array with just one link item inside of it.
+        */
+       function makeListItem( $key, $item, $options = array() ) {
+               if ( isset( $item['links'] ) ) {
+                       $html = '';
+                       foreach ( $item['links'] as $linkKey => $link ) {
+                               $html .= $this->makeLink( $linkKey, $link );
+                       }
+               } else {
+                       $link = array();
+                       foreach ( array( 'text', 'msg', 'href', 'rel', 'type', 'tooltiponly' ) as $k ) {
+                               if ( isset( $item[$k] ) ) {
+                                       $link[$k] = $item[$k];
+                               }
+                       }
+                       if ( isset( $item['id'] ) ) {
+                               // The id goes on the <li> not on the <a> for single links
+                               // but makeSidebarLink still needs to know what id to use when
+                               // generating tooltips and accesskeys.
+                               $link['single-id'] = $item['id'];
+                       }
+                       $html = $this->makeLink( $key, $link );
+               }
+
+               $attrs = array();
+               foreach ( array( 'id', 'class' ) as $attr ) {
+                       if ( isset( $item[$attr] ) ) {
+                               $attrs[$attr] = $item[$attr];
+                       }
+               }
+               if ( isset( $item['active'] ) && $item['active'] ) {
+                       if ( !isset( $attrs['class'] ) ) {
+                               $attrs['class'] = '';
+                       }
+                       $attrs['class'] .= ' active';
+                       $attrs['class'] = trim( $attrs['class'] );
+               }
+               return Html::rawElement( isset( $options['tag'] ) ? $options['tag'] : 'li', $attrs, $html );
+       }
+
+       function makeSearchInput( $attrs = array() ) {
+               $realAttrs = array(
+                       'type' => 'search',
+                       'name' => 'search',
+                       'value' => isset( $this->data['search'] ) ? $this->data['search'] : '',
+               );
+               $realAttrs = array_merge( $realAttrs, $this->skin->tooltipAndAccesskeyAttribs( 'search' ), $attrs );
+               return Html::element( 'input', $realAttrs );
+       }
+
+       function makeSearchButton( $mode, $attrs = array() ) {
+               switch( $mode ) {
+                       case 'go':
+                       case 'fulltext':
+                               $realAttrs = array(
+                                       'type' => 'submit',
+                                       'name' => $mode,
+                                       'value' => $this->translator->translate( $mode == 'go' ? 'searcharticle' : 'searchbutton' ),
+                               );
+                               $realAttrs = array_merge(
+                                       $realAttrs,
+                                       $this->skin->tooltipAndAccesskeyAttribs( "search-$mode" ),
+                                       $attrs
+                               );
+                               return Html::element( 'input', $realAttrs );
+                       case 'image':
+                               $buttonAttrs = array(
+                                       'type' => 'submit',
+                                       'name' => 'button',
+                               );
+                               $buttonAttrs = array_merge(
+                                       $buttonAttrs,
+                                       $this->skin->tooltipAndAccesskeyAttribs( 'search-fulltext' ),
+                                       $attrs
+                               );
+                               unset( $buttonAttrs['src'] );
+                               unset( $buttonAttrs['alt'] );
+                               $imgAttrs = array(
+                                       'src' => $attrs['src'],
+                                       'alt' => isset( $attrs['alt'] ) ? $attrs['alt'] : $this->translator->translate( 'searchbutton' ),
+                               );
+                               return Html::rawElement( 'button', $buttonAttrs, Html::element( 'img', $imgAttrs ) );
+                       default:
+                               throw new MWException( 'Unknown mode passed to BaseTemplate::makeSearchButton' );
+               }
+       }
+
+       /**
+        * Returns an array of footerlinks trimmed down to only those footer links that
+        * are valid.
+        * If you pass "flat" as an option then the returned array will be a flat array
+        * of footer icons instead of a key/value array of footerlinks arrays broken
+        * up into categories.
+        */
+       function getFooterLinks( $option = null ) {
+               $footerlinks = $this->data['footerlinks'];
+
+               // Reduce footer links down to only those which are being used
+               $validFooterLinks = array();
+               foreach( $footerlinks as $category => $links ) {
+                       $validFooterLinks[$category] = array();
+                       foreach( $links as $link ) {
+                               if( isset( $this->data[$link] ) && $this->data[$link] ) {
+                                       $validFooterLinks[$category][] = $link;
+                               }
+                       }
+                       if ( count( $validFooterLinks[$category] ) <= 0 ) {
+                               unset( $validFooterLinks[$category] );
+                       }
+               }
+
+               if ( $option == 'flat' ) {
+                       // fold footerlinks into a single array using a bit of trickery
+                       $validFooterLinks = call_user_func_array(
+                               'array_merge',
+                               array_values( $validFooterLinks )
+                       );
+               }
+
+               return $validFooterLinks;
+       }
+
+       /**
+        * Returns an array of footer icons filtered down by options relevant to how
+        * the skin wishes to display them.
+        * If you pass "icononly" as the option all footer icons which do not have an
+        * image icon set will be filtered out.
+        * If you pass "nocopyright" then MediaWiki's copyright icon will not be included
+        * in the list of footer icons. This is mostly useful for skins which only
+        * display the text from footericons instead of the images and don't want a
+        * duplicate copyright statement because footerlinks already rendered one.
+        */
+       function getFooterIcons( $option = null ) {
+               // Generate additional footer icons
+               $footericons = $this->data['footericons'];
+
+               if ( $option == 'icononly' ) {
+                       // Unset any icons which don't have an image
+                       foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) {
+                               foreach ( $footerIconsBlock as $footerIconKey => $footerIcon ) {
+                                       if ( !is_string( $footerIcon ) && !isset( $footerIcon['src'] ) ) {
+                                               unset( $footerIconsBlock[$footerIconKey] );
+                                       }
+                               }
+                       }
+                       // Redo removal of any empty blocks
+                       foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) {
+                               if ( count( $footerIconsBlock ) <= 0 ) {
+                                       unset( $footericons[$footerIconsKey] );
+                               }
+                       }
+               } elseif ( $option == 'nocopyright' ) {
+                       $footericons = $this->data['footericons'];
+                       unset( $footericons['copyright']['copyright'] );
+                       if ( count( $footericons['copyright'] ) <= 0 ) {
+                               unset( $footericons['copyright'] );
+                       }
+               }
+
+               return $footericons;
+       }
+
+
+}
+