Per Platonides on CR r75334, use $article->getParserOutput() to get latest revision...
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 0a18bb7..dcbd44b 100644 (file)
@@ -495,7 +495,9 @@ class SkinTemplate extends Skin {
                wfProfileIn( __METHOD__ . '-stuff5' );
                # Personal toolbar
                $tpl->set( 'personal_urls', $this->buildPersonalUrls() );
-               $content_actions = $this->buildContentActionUrls();
+               $content_navigation = $this->buildContentNavigationUrls();
+               $content_actions = $this->buildContentActionUrls( $content_navigation );
+               $tpl->setRef( 'content_navigation', $content_navigation );
                $tpl->setRef( 'content_actions', $content_actions );
 
                $tpl->set( 'sidebar', $this->buildSidebar() );
@@ -720,7 +722,8 @@ class SkinTemplate extends Skin {
                return array(
                        'class' => implode( ' ', $classes ),
                        'text' => $text,
-                       'href' => $title->getLocalUrl( $query ) );
+                       'href' => $title->getLocalUrl( $query ),
+                       'primary' => true );
        }
 
        function makeTalkUrlDetails( $name, $urlaction = '' ) {
@@ -747,204 +750,367 @@ class SkinTemplate extends Skin {
        }
 
        /**
-        * an array of edit links by default used for the tabs
+        * a structured array of links usually used for the tabs in a skin
+        * 
+        * There are 4 standard sections
+        * namespaces: Used for namespace tabs like special, page, and talk namespaces
+        * views: Used for primary page views like read, edit, history
+        * actions: Used for most extra page actions like deletion, protection, etc...
+        * variants: Used to list the language variants for the page
+        * 
+        * Each section's value is a key/value array of links for that section.
+        * The links themseves have these common keys:
+        * - class: The css classes to apply to the tab
+        * - text: The text to display on the tab
+        * - href: The href for the tab to point to
+        * - rel: An optional rel= for the tab's link
+        * - redundant: If true the tab will be dropped in skins using content_actions
+        *   this is useful for tabs like "Read" which only have meaning in skins that
+        *   take special meaning from the grouped structure of content_navigation
+        * 
+        * Views also have an extra key which can be used:
+        * - primary: If this is not true skins like vector may try to hide the tab
+        *            when the user has limited space in their browser window
+        * 
+        * content_navigation using code also expects these ids to be present on the
+        * links, however these are usually automatically generated by SkinTemplate
+        * itself and are not necessary when using a hook. The only things these may
+        * matter to are people modifying content_navigation after it's initial creation:
+        * - id: A "preferred" id, most skins are best off outputting this preferred id for best compatibility
+        * - tooltiponly: This is set to true for some tabs in cases where the system
+        *                believes that the accesskey should not be added to the tab.
+        * 
         * @return array
         * @private
         */
-       function buildContentActionUrls() {
+       function buildContentNavigationUrls() {
                global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
+               global $wgDisableLangConversion;
 
                wfProfileIn( __METHOD__ );
+               
+               $title = $this->getRelevantTitle(); // Display tabs for the relevant title rather than always the title itself
+               $onPage = $title->equals($this->mTitle);
+               
+               $content_navigation = array(
+                       'namespaces' => array(),
+                       'views' => array(),
+                       'actions' => array(),
+                       'variants' => array()
+               );
 
+               // parameters
                $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 ) );
+               $userCanRead = $title->userCanRead();
+               $skname = $this->skinname;
 
-               if( $this->iscontent ) {
-                       $subjpage = $this->mTitle->getSubjectPage();
-                       $talkpage = $this->mTitle->getTalkPage();
+               $preventActiveTabs = false;
+               wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$preventActiveTabs ) );
 
-                       $nskey = $this->mTitle->getNamespaceKey();
-                       $content_actions[$nskey] = $this->tabAction(
-                               $subjpage,
-                               $nskey,
-                               !$this->mTitle->isTalkPage() && !$prevent_active_tabs,
-                               '', $userCanRead
-                       );
+               // Checks if page is some kind of content
+               if( $title->getNamespace() != NS_SPECIAL ) {
+                       // Gets page objects for the related namespaces
+                       $subjectPage = $title->getSubjectPage();
+                       $talkPage = $title->getTalkPage();
+
+                       // Determines if this is a talk page
+                       $isTalk = $title->isTalkPage();
 
-                       $content_actions['talk'] = $this->tabAction(
-                               $talkpage,
-                               'talk',
-                               $this->mTitle->isTalkPage() && !$prevent_active_tabs,
-                               '',
-                               $userCanRead
+                       // Generates XML IDs from namespace names
+                       $subjectId = $title->getNamespaceKey( '' );
+
+                       if ( $subjectId == 'main' ) {
+                               $talkId = 'talk';
+                       } else {
+                               $talkId = "{$subjectId}_talk";
+                       }
+
+                       // Adds namespace links
+                       $content_navigation['namespaces'][$subjectId] = $this->tabAction(
+                               $subjectPage, 'nstab-' . $subjectId, !$isTalk && !$preventActiveTabs, '', $userCanRead
+                       );
+                       $content_navigation['namespaces'][$subjectId]['context'] = 'subject';
+                       $content_navigation['namespaces'][$talkId] = $this->tabAction(
+                               $talkPage, 'talk', $isTalk && !$preventActiveTabs, '', $userCanRead
                        );
+                       $content_navigation['namespaces'][$talkId]['context'] = 'talk';
+
+                       // Adds view view link
+                       if ( $title->exists() && $userCanRead ) {
+                               $content_navigation['views']['view'] = $this->tabAction(
+                                       $isTalk ? $talkPage : $subjectPage,
+                                       !wfEmptyMsg( "$skname-view-view" ) ? "$skname-view-view" : 'view',
+                                       ( $onPage && $action == 'view' ), '', true
+                               );
+                               $content_navigation['views']['view']['redundant'] = true; // signal to hide this from simple content_actions
+                       }
 
                        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() || ( $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
-                               if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
+                       // Checks if user can...
+                       if (
+                               // read and edit the current page
+                               $userCanRead && $title->quickUserCan( 'edit' ) &&
+                               (
+                                       // if it exists
+                                       $title->exists() ||
+                                       // or they can create one here
+                                       $title->quickUserCan( 'create' )
+                               )
+                       ) {
+                               // Builds CSS class for talk page links
+                               $isTalkClass = $isTalk ? ' istalk' : '';
+
+                               // Determines if we're in edit mode
+                               $selected = (
+                                       $onPage &&
+                                       ( $action == 'edit' || $action == 'submit' ) &&
+                                       ( $section != 'new' )
+                               );
+                               $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && !wfEmptyMsg( $title->getText() ) ) ?
+                                       "edit" : "create";
+                               $content_navigation['views']['edit'] = array(
+                                       'class' => ( $selected ? 'selected' : '' ) . $isTalkClass,
+                                       'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->plain(),
+                                       'href' => $title->getLocalURL( $this->editUrlOptions() ),
+                                       'primary' => true, // don't collapse this in vector
+                               );
+                               // Checks if this is a current rev of talk page and we should show a new
+                               // section link
+                               if ( ( $isTalk && $wgArticle && $wgArticle->isCurrent() ) || ( $wgOut->showNewSectionLink() ) ) {
+                                       // Checks if we should ever show a new section link
                                        if ( !$wgOut->forceHideNewSectionLink() ) {
-                                               $content_actions['addsection'] = array(
+                                               // Adds new section link
+                                               //$content_navigation['actions']['addsection']
+                                               $content_navigation['views']['addsection'] = array(
                                                        'class' => $section == 'new' ? 'selected' : false,
-                                                       'text' => wfMsg( 'addsection' ),
-                                                       'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
+                                                       'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->plain(),
+                                                       'href' => $title->getLocalURL( 'action=edit&section=new' )
                                                );
                                        }
                                }
-                       } elseif ( $this->mTitle->hasSourceText() && $userCanRead ) {
-                               $content_actions['viewsource'] = array(
-                                       'class' => ($action == 'edit') ? 'selected' : false,
-                                       'text' => wfMsg( 'viewsource' ),
-                                       'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
+                       // Checks if the page has some kind of viewable content
+                       } elseif ( $title->hasSourceText() && $userCanRead ) {
+                               // Adds view source view link
+                               $content_navigation['views']['viewsource'] = array(
+                                       'class' => ( $onPage && $action == 'edit' ) ? 'selected' : false,
+                                       'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->plain(),
+                                       'href' => $title->getLocalURL( $this->editUrlOptions() ),
+                                       'primary' => true, // don't collapse this in vector
                                );
                        }
                        wfProfileOut( __METHOD__ . '-edit' );
 
                        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' ),
+                       // Checks if the page exists
+                       if ( $title->exists() && $userCanRead ) {
+                               // Adds history view link
+                               $content_navigation['views']['history'] = array(
+                                       'class' => ( $onPage && $action == 'history' ) ? 'selected' : false,
+                                       'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->plain(),
+                                       'href' => $title->getLocalURL( 'action=history' ),
                                        'rel' => 'archives',
                                );
 
                                if( $wgUser->isAllowed( 'delete' ) ) {
-                                       $content_actions['delete'] = array(
-                                               'class' => ($action == 'delete') ? 'selected' : false,
-                                               'text' => wfMsg( 'delete' ),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
+                                       $content_navigation['actions']['delete'] = array(
+                                               'class' => ( $onPage && $action == 'delete' ) ? 'selected' : false,
+                                               'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->plain(),
+                                               'href' => $title->getLocalURL( 'action=delete' )
                                        );
                                }
-                               if ( $this->mTitle->quickUserCan( 'move' ) ) {
-                                       $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
-                                       $content_actions['move'] = array(
+                               if ( $title->quickUserCan( 'move' ) ) {
+                                       $moveTitle = SpecialPage::getTitleFor( 'Movepage', $title->getPrefixedDBkey() );
+                                       $content_navigation['actions']['move'] = array(
                                                'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
-                                               'text' => wfMsg( 'move' ),
-                                               'href' => $moveTitle->getLocalUrl()
+                                               'text' => wfMessageFallback( "$skname-action-move", 'move' )->plain(),
+                                               'href' => $moveTitle->getLocalURL()
                                        );
                                }
 
-                               if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
-                                       if( !$this->mTitle->isProtected() ){
-                                               $content_actions['protect'] = array(
-                                                       'class' => ($action == 'protect') ? 'selected' : false,
-                                                       'text' => wfMsg( 'protect' ),
-                                                       'href' => $this->mTitle->getLocalUrl( 'action=protect' )
-                                               );
-
-                                       } else {
-                                               $content_actions['unprotect'] = array(
-                                                       'class' => ($action == 'unprotect') ? 'selected' : false,
-                                                       'text' => wfMsg( 'unprotect' ),
-                                                       'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
-                                               );
-                                       }
+                               if ( $title->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
+                                       $mode = !$title->isProtected() ? 'protect' : 'unprotect';
+                                       $content_navigation['actions'][$mode] = array(
+                                               'class' => ( $onPage && $action == $mode ) ? 'selected' : false,
+                                               'text' => wfMessageFallback( "$skname-action-$mode", $mode )->plain(),
+                                               'href' => $title->getLocalURL( "action=$mode" )
+                                       );
                                }
                        } else {
-                               //article doesn't exist or is deleted
-                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'deletedtext' ) ) {
-                                       $n = $this->mTitle->isDeleted();
+                               // article doesn't exist or is deleted
+                               if ( $wgUser->isAllowed( 'deletedhistory' ) ) {
+                                       $n = $title->isDeleted();
                                        if( $n ) {
                                                $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
-                                               $content_actions['undelete'] = array(
-                                                       'class' => false,
-                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum( $n ) ),
-                                                       'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
-                                                       #'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
+                                               // If the user can't undelete but can view deleted history show them a "View .. deleted" tab instead
+                                               $msgKey = $wgUser->isAllowed( 'undelete' ) ? 'undelete' : 'viewdeleted';
+                                               $content_navigation['actions']['undelete'] = array(
+                                                       'class' => $this->mTitle->isSpecial( 'Undelete' ) ? 'selected' : false,
+                                                       'text' => wfMessageFallback( "$skname-action-$msgKey", "{$msgKey}_short" )
+                                                               ->params( $wgLang->formatNum( $n ) )->text(),
+                                                       'href' => $undelTitle->getLocalURL( array( 'target' => $title->getPrefixedDBkey() ) )
                                                );
                                        }
                                }
 
-                               if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
-                                       if( !$this->mTitle->getRestrictions( 'create' ) ) {
-                                               $content_actions['protect'] = array(
-                                                       'class' => ($action == 'protect') ? 'selected' : false,
-                                                       'text' => wfMsg( 'protect' ),
-                                                       'href' => $this->mTitle->getLocalUrl( 'action=protect' )
-                                               );
-
-                                       } else {
-                                               $content_actions['unprotect'] = array(
-                                                       'class' => ($action == 'unprotect') ? 'selected' : false,
-                                                       'text' => wfMsg( 'unprotect' ),
-                                                       'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
-                                               );
-                                       }
+                               if ( $title->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
+                                       $mode = !$title->getRestrictions( 'create' ) ? 'protect' : 'unprotect';
+                                       $content_navigation['actions'][$mode] = array(
+                                               'class' => ( $onPage && $action == $mode ) ? 'selected' : false,
+                                               'text' => wfMessageFallback( "$skname-action-$mode", $mode )->plain(),
+                                               'href' => $title->getLocalURL( "action=$mode" )
+                                       );
                                }
                        }
-
                        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' ),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=watch' )
-                                       );
-                               } else {
-                                       $content_actions['unwatch'] = array(
-                                               'class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
-                                               'text' => wfMsg( 'unwatch' ),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
-                                       );
-                               }
+                       // Checks if the user is logged in
+                       if ( $this->loggedin ) {
+                               /**
+                                * The following actions use messages which, if made particular to
+                                * the any specific skins, would break the Ajax code which makes this
+                                * action happen entirely inline. Skin::makeGlobalVariablesScript
+                                * defines a set of messages in a javascript object - and these
+                                * messages are assumed to be global for all skins. Without making
+                                * a change to that procedure these messages will have to remain as
+                                * the global versions.
+                                */
+                               $mode = $title->userIsWatching() ? 'unwatch' : 'watch';
+                               $content_navigation['actions'][$mode] = array(
+                                       'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false,
+                                       'text' => wfMsg( $mode ), // uses 'watch' or 'unwatch' message
+                                       'href' => $title->getLocalURL( 'action=' . $mode )
+                               );
                        }
-
-
-                       wfRunHooks( 'SkinTemplateTabs', array( $this, &$content_actions ) );
+                       
+                       wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$content_navigation ) );
                } else {
-                       /* show special page tab */
-
-                       $content_actions[$this->mTitle->getNamespaceKey()] = array(
+                       // If it's not content, it's got to be a special page
+                       $content_navigation['namespaces']['special'] = array(
                                'class' => 'selected',
-                               'text' => wfMsg('nstab-special'),
+                               'text' => wfMsg( 'nstab-special' ),
                                'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
+                               'context' => 'subject'
                        );
-
-                       wfRunHooks( 'SkinTemplateBuildContentActionUrlsAfterSpecialPage', array( &$this, &$content_actions ) );
+                       
+                       wfRunHooks( 'SkinTemplateNavigation::SpecialPage', array( &$this, &$content_navigation ) );
                }
 
-               /* show links to different language variants */
-               global $wgDisableLangConversion;
+               // Gets list of language variants
                $variants = $wgContLang->getVariants();
-               if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
+               // Checks that language conversion is enabled and variants exist
+               if( !$wgDisableLangConversion && count( $variants ) > 1 ) {
+                       // Gets preferred variant
                        $preferred = $wgContLang->getPreferredVariant();
-                       $vcount=0;
+                       // Loops over each variant
                        foreach( $variants as $code ) {
+                               // Gets variant name from language code
                                $varname = $wgContLang->getVariantname( $code );
-                               if( $varname == 'disable' )
+                               // Checks if the variant is marked as disabled
+                               if( $varname == 'disable' ) {
+                                       // Skips this variant
                                        continue;
-                               $selected = ( $code == $preferred )? 'selected' : false;
-                               $content_actions['varlang-' . $vcount] = array(
-                                       'class' => $selected,
+                               }
+                               // Appends variant link
+                               $content_navigation['variants'][] = array(
+                                       'class' => ( $code == $preferred ) ? 'selected' : false,
                                        'text' => $varname,
-                                       'href' => $this->mTitle->getLocalURL( '', $code )
+                                       'href' => $title->getLocalURL( '', $code )
                                );
-                               $vcount ++;
                        }
                }
 
-               wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
+               // Equiv to SkinTemplateContentActions
+               wfRunHooks( 'SkinTemplateNavigation::Universal', array( &$this,  &$content_navigation ) );
+
+               // Setup xml ids and tooltip info
+               foreach ( $content_navigation as $section => &$links ) {
+                       foreach ( $links as $key => &$link ) {
+                               $xmlID = $key;
+                               if ( isset( $link['context'] ) && $link['context'] == 'subject' ) {
+                                       $xmlID = 'ca-nstab-' . $xmlID;
+                               } elseif ( isset( $link['context'] ) && $link['context'] == 'talk' ) {
+                                       $xmlID = 'ca-talk';
+                               } elseif ( $section == "variants" ) {
+                                       $xmlID = 'ca-varlang-' . $xmlID;
+                               } else {
+                                       $xmlID = 'ca-' . $xmlID;
+                               }
+                               $link['id'] = $xmlID;
+                       }
+               }
+               
+               # We don't want to give the watch tab an accesskey if the
+               # page is being edited, because that conflicts with the
+               # accesskey on the watch checkbox.  We also don't want to
+               # give the edit tab an accesskey, because that's fairly su-
+               # perfluous and conflicts with an accesskey (Ctrl-E) often
+               # used for editing in Safari.
+               if( in_array( $action, array( 'edit', 'submit' ) ) ) {
+                       if ( isset($content_navigation['views']['edit']) ) {
+                               $content_navigation['views']['edit']['tooltiponly'] = true;
+                       }
+                       if ( isset($content_navigation['actions']['watch']) ) {
+                               $content_navigation['actions']['watch']['tooltiponly'] = true;
+                       }
+                       if ( isset($content_navigation['actions']['unwatch']) ) {
+                               $content_navigation['actions']['unwatch']['tooltiponly'] = true;
+                       }
+               }
+               
+               wfProfileOut( __METHOD__ );
+
+               return $content_navigation;
+       }
 
+       /**
+        * an array of edit links by default used for the tabs
+        * @return array
+        * @private
+        */
+       function buildContentActionUrls( $content_navigation ) {
+
+               wfProfileIn( __METHOD__ );
+
+               // content_actions has been replaced with content_navigation for backwards
+               // compatibility and also for skins that just want simple tabs content_actions
+               // is now built by flattening the content_navigation arrays into one
+               
+               $content_actions = array();
+               
+               foreach ( $content_navigation as $section => $links ) {
+                       
+                       foreach ( $links as $key => $value ) {
+                               
+                               if ( isset($value["redundant"]) && $value["redundant"] ) {
+                                       // Redundant tabs are dropped from content_actions
+                                       continue;
+                               }
+                               
+                               // content_actions used to have ids built using the "ca-$key" pattern
+                               // so the xmlID based id is much closer to the actual $key that we want
+                               // for that reason we'll just strip out the ca- if present and use
+                               // the latter potion of the "id" as the $key
+                               if ( isset($value["id"]) && substr($value["id"], 0, 3) == "ca-" ) {
+                                       $key = substr($value["id"], 3);
+                               }
+                               
+                               if ( isset($content_actions[$key]) ) {
+                                       wfDebug( __METHOD__ . ": Found a duplicate key for $key while flattening content_navigation into content_actions." );
+                                       continue;
+                               }
+                               
+                               $content_actions[$key] = $value;
+                               
+                       }
+                       
+               }
+               
                wfProfileOut( __METHOD__ );
+               
                return $content_actions;
        }
 
@@ -1017,10 +1183,10 @@ class SkinTemplate extends Skin {
                                );
                }
 
-               if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
-                       $rootUser = strtok( $this->mTitle->getText(), '/' );
-                       $id = User::idFromName( $rootUser );
-                       $ip = User::isIP( $rootUser );
+               if ( $user = $this->getRelevantUser() ) {
+                       $id = $user->getID();
+                       $ip = $user->isAnon();
+                       $rootUser = $user->getName();
                } else {
                        $id = 0;
                        $ip = false;
@@ -1289,6 +1455,35 @@ abstract class BaseTemplate extends QuickTemplate {
                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...
@@ -1380,7 +1575,7 @@ abstract class BaseTemplate extends QuickTemplate {
                                // generating tooltips and accesskeys.
                                $link['single-id'] = $item['id'];
                        }
-                       $html = $this->makeLink( $key, $link  );
+                       $html = $this->makeLink( $key, $link );
                }
 
                $attrs = array();
@@ -1390,6 +1585,9 @@ abstract class BaseTemplate extends QuickTemplate {
                        }
                }
                if ( isset( $item['active'] ) && $item['active'] ) {
+                       if ( !isset( $attrs['class'] ) ) {
+                               $attrs['class'] = '';
+                       }
                        $attrs['class'] .= ' active';
                        $attrs['class'] = trim( $attrs['class'] );
                }
@@ -1518,6 +1716,21 @@ abstract class BaseTemplate extends QuickTemplate {
                return $footericons;
        }
 
+       /**
+        * Output the basic end-page trail including bottomscripts, reporttime, and
+        * debug stuff. This should be called right before outputting the closing
+        * body and html tags.
+        */
+       function printTrail() { ?>
+<?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
+<?php $this->html('reporttime') ?>
+<?php if ( $this->data['debug'] ): ?>
+<!-- Debug output:
+<?php $this->text( 'debug' ); ?>
+
+-->
+<?php endif;
+       }
 
 }