Oops, gotta use $exp here
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index a4238cc..c60cfb4 100644 (file)
@@ -17,26 +17,12 @@ if ( ! defined( 'MEDIAWIKI' ) )
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
-/**
- * Template-filler skin base class
- * Formerly generic PHPTal (http://phptal.sourceforge.net/) skin
- * Based on Brion's smarty skin
- * Copyright (C) Gabriel Wicke -- http://www.aulinx.de/
- *
- * Todo: Needs some serious refactoring into functions that correspond
- * to the computations individual esi snippets need. Most importantly no body
- * parsing for most of those of course.
- *
- * @package MediaWiki
- * @subpackage Skins
- */
-
 /**
  * Wrapper object for MediaWiki's localization functions,
  * to be passed to the template engine.
  *
  * @private
- * @package MediaWiki
+ * @ingroup Skins
  */
 class MediaWiki_I18N {
        var $_context = array();
@@ -46,14 +32,14 @@ class MediaWiki_I18N {
        }
 
        function translate($value) {
-               $fname = 'SkinTemplate-translate';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                // Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
                $value = preg_replace( '/^string:/', '', $value );
 
                $value = wfMsg( $value );
                // interpolate variables
+               $m = array();
                while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
                        list($src, $var) = $m;
                        wfSuppressWarnings();
@@ -61,14 +47,22 @@ class MediaWiki_I18N {
                        wfRestoreWarnings();
                        $value = str_replace($src, $varValue, $value);
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $value;
        }
 }
 
 /**
+ * Template-filler skin base class
+ * Formerly generic PHPTal (http://phptal.sourceforge.net/) skin
+ * Based on Brion's smarty skin
+ * @copyright Copyright © Gabriel Wicke -- http://www.aulinx.de/
  *
- * @package MediaWiki
+ * @todo Needs some serious refactoring into functions that correspond
+ * to the computations individual esi snippets need. Most importantly no body
+ * parsing for most of those of course.
+ *
+ * @ingroup Skins
  */
 class SkinTemplate extends Skin {
        /**#@+
@@ -93,6 +87,12 @@ class SkinTemplate extends Skin {
         */
        var $template;
 
+       /**
+        * An array of strings representing extra CSS files to load.  May include:
+        * 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl'.
+        */
+       var $cssfiles;
+
        /**#@-*/
 
        /**
@@ -107,6 +107,7 @@ class SkinTemplate extends Skin {
                $this->skinname  = 'monobook';
                $this->stylename = 'monobook';
                $this->template  = 'QuickTemplate';
+               $this->cssfiles = array();
        }
 
        /**
@@ -134,22 +135,19 @@ class SkinTemplate extends Skin {
                global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
                global $wgScript, $wgStylePath, $wgContLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
+               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
                global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
                global $wgUseTrackbacks;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
 
-               $fname = 'SkinTemplate::outputPage';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
-               // Hook that allows last minute changes to the output page, e.g.
-               // adding of CSS or Javascript by extensions.
-               wfRunHooks( 'BeforePageDisplay', array( &$out ) );
-
-               extract( $wgRequest->getValues( 'oldid', 'diff' ) );
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
 
-               wfProfileIn( "$fname-init" );
+               wfProfileIn( __METHOD__."-init" );
                $this->initPage( $out );
 
                $this->mTitle =& $wgTitle;
@@ -160,9 +158,9 @@ class SkinTemplate extends Skin {
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
                #}
-               wfProfileOut( "$fname-init" );
+               wfProfileOut( __METHOD__."-init" );
 
-               wfProfileIn( "$fname-stuff" );
+               wfProfileIn( __METHOD__."-stuff" );
                $this->thispage = $this->mTitle->getPrefixedDbKey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
                $this->loggedin = $wgUser->isLoggedIn();
@@ -182,26 +180,29 @@ class SkinTemplate extends Skin {
 
                $this->usercss =  $this->userjs = $this->userjsprev = false;
                $this->setupUserCss();
-               $this->setupUserJs();
+               $this->setupUserJs( $out->isUserJsAllowed() );
                $this->titletxt = $this->mTitle->getPrefixedText();
-               wfProfileOut( "$fname-stuff" );
+               wfProfileOut( __METHOD__."-stuff" );
 
-               wfProfileIn( "$fname-stuff2" );
+               wfProfileIn( __METHOD__."-stuff2" );
                $tpl->set( 'title', $wgOut->getPageTitle() );
                $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
                $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
-               $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() ) );
+               $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) );
 
-               $nsname = @$wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ];
-               if ( $nsname === NULL ) $nsname = $this->mTitle->getNsText();
+               $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
+                         $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
+                         $this->mTitle->getNsText();
 
                $tpl->set( 'nscanonical', $nsname );
                $tpl->set( 'nsnumber', $this->mTitle->getNamespace() );
                $tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() );
                $tpl->set( 'titletext', $this->mTitle->getText() );
                $tpl->set( 'articleid', $this->mTitle->getArticleId() );
+               $tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
+
                $tpl->set( 'isarticle', $wgOut->isArticle() );
-                               
+
                $tpl->setRef( "thispage", $this->thispage );
                $subpagestr = $this->subPageSubtitle();
                $tpl->set(
@@ -219,25 +220,23 @@ class SkinTemplate extends Skin {
                $tpl->set( 'catlinks', $this->getCategories());
                if( $wgOut->isSyndicated() ) {
                        $feeds = array();
-                       foreach( $wgFeedClasses as $format => $class ) {
-                               $linktext = $format;
-                               if ( $format == "atom" ) {
-                                       $linktext = wfMsg( 'feed-atom' );
-                               } else if ( $format == "rss" ) {
-                                       $linktext = wfMsg( 'feed-rss' );
-                               }
+                       foreach( $wgOut->getSyndicationLinks() as $format => $link ) {
                                $feeds[$format] = array(
-                                       'text' => $linktext,
-                                       'href' => $wgRequest->appendQuery( "feed=$format" )
-                               );
+                                       'text' => wfMsg( "feed-$format" ),
+                                       'href' => $link );
                        }
                        $tpl->setRef( 'feeds', $feeds );
                } else {
                        $tpl->set( 'feeds', false );
                }
-               if ($wgUseTrackbacks && $out->isArticleRelated())
-                       $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF());
+               if ($wgUseTrackbacks && $out->isArticleRelated()) {
+                       $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() );
+               } else {
+                       $tpl->set( 'trackbackhtml', null );
+               }
 
+               $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
+               $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
                $tpl->setRef( 'mimetype', $wgMimeType );
                $tpl->setRef( 'jsmimetype', $wgJsMimeType );
                $tpl->setRef( 'charset', $wgOutputEncoding );
@@ -275,16 +274,17 @@ class SkinTemplate extends Skin {
                $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
                $tpl->set( 'userlang', $wgLang->getCode() );
                $tpl->set( 'pagecss', $this->setupPageCss() );
+               $tpl->set( 'printcss', $this->getPrintCss() );
                $tpl->setRef( 'usercss', $this->usercss);
                $tpl->setRef( 'userjs', $this->userjs);
                $tpl->setRef( 'userjsprev', $this->userjsprev);
                global $wgUseSiteJs;
                if ($wgUseSiteJs) {
-                       if($this->loggedin) {
-                               $tpl->set( 'jsvarurl', self::makeUrl('-','action=raw&smaxage=0&gen=js') );
-                       } else {
-                               $tpl->set( 'jsvarurl', self::makeUrl('-','action=raw&gen=js') );
-                       }
+                       $jsCache = $this->loggedin ? '&smaxage=0' : '';
+                       $tpl->set( 'jsvarurl',
+                               self::makeUrl('-',
+                                       "action=raw$jsCache&gen=js&useskin=" .
+                                               urlencode( $this->getSkinName() ) ) );
                } else {
                        $tpl->set('jsvarurl', false);
                }
@@ -322,14 +322,14 @@ class SkinTemplate extends Skin {
                } else {
                        $ntl = '';
                }
-               wfProfileOut( "$fname-stuff2" );
+               wfProfileOut( __METHOD__."-stuff2" );
 
-               wfProfileIn( "$fname-stuff3" );
+               wfProfileIn( __METHOD__."-stuff3" );
                $tpl->setRef( 'newtalk', $ntl );
                $tpl->setRef( 'skin', $this);
                $tpl->set( 'logo', $this->logoText() );
-               if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and 
-                       $wgArticle and 0 != $wgArticle->getID() ) 
+               if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and
+                       $wgArticle and 0 != $wgArticle->getID() )
                {
                        if ( !$wgDisableCounters ) {
                                $viewcount = $wgLang->formatNum( $wgArticle->getCount() );
@@ -343,16 +343,19 @@ class SkinTemplate extends Skin {
                        }
 
                        if ($wgPageShowWatchingUsers) {
-                               $dbr =& wfGetDB( DB_SLAVE );
-                               extract( $dbr->tableNames( 'watchlist' ) );
+                               $dbr = wfGetDB( DB_SLAVE );
+                               $watchlist = $dbr->tableName( 'watchlist' );
                                $sql = "SELECT COUNT(*) AS n FROM $watchlist
-                                       WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBKey()) .
+                                       WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) .
                                        "' AND  wl_namespace=" . $this->mTitle->getNamespace() ;
                                $res = $dbr->query( $sql, 'SkinTemplate::outputPage');
                                $x = $dbr->fetchObject( $res );
                                $numberofwatchingusers = $x->n;
                                if ($numberofwatchingusers > 0) {
-                                       $tpl->set('numberofwatchingusers', wfMsg('number_of_watching_users_pageview', $numberofwatchingusers));
+                                       $tpl->set('numberofwatchingusers',
+                                               wfMsgExt('number_of_watching_users_pageview', array('parseinline'),
+                                               $wgLang->formatNum($numberofwatchingusers))
+                                       );
                                } else {
                                        $tpl->set('numberofwatchingusers', false);
                                }
@@ -386,9 +389,9 @@ class SkinTemplate extends Skin {
                        $tpl->set('credits', false);
                        $tpl->set('numberofwatchingusers', false);
                }
-               wfProfileOut( "$fname-stuff3" );
+               wfProfileOut( __METHOD__."-stuff3" );
 
-               wfProfileIn( "$fname-stuff4" );
+               wfProfileIn( __METHOD__."-stuff4" );
                $tpl->set( 'copyrightico', $this->getCopyrightIcon() );
                $tpl->set( 'poweredbyico', $this->getPoweredBy() );
                $tpl->set( 'disclaimer', $this->disclaimerLink() );
@@ -396,7 +399,7 @@ class SkinTemplate extends Skin {
                $tpl->set( 'about', $this->aboutLink() );
 
                $tpl->setRef( 'debug', $out->mDebugtext );
-               $tpl->set( 'reporttime', $out->reportTime() );
+               $tpl->set( 'reporttime', wfReportTime() );
                $tpl->set( 'sitenotice', wfGetSiteNotice() );
                $tpl->set( 'bottomscripts', $this->bottomScripts() );
 
@@ -425,7 +428,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('language_urls', false);
                }
-               wfProfileOut( "$fname-stuff4" );
+               wfProfileOut( __METHOD__."-stuff4" );
 
                # Personal toolbar
                $tpl->set('personal_urls', $this->buildPersonalUrls());
@@ -435,26 +438,28 @@ class SkinTemplate extends Skin {
                // XXX: attach this from javascript, same with section editing
                if($this->iseditable && $wgUser->getOption("editondblclick") )
                {
-                       $tpl->set('body_ondblclick', 'document.location = "' .$content_actions['edit']['href'] .'";');
+                       $encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
+                       $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
                } else {
                        $tpl->set('body_ondblclick', false);
                }
-               if( $this->iseditable && $wgUser->getOption( 'editsectiononrightclick' ) ) {
-                       $tpl->set( 'body_onload', 'setupRightClickEdit()' );
-               } else {
-                       $tpl->set( 'body_onload', false );
-               }
+               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
+               // original version by hansm
+               if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
+                       wfDebug( __METHOD__ . ': Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!' );
+               }
+
                // execute template
-               wfProfileIn( "$fname-execute" );
+               wfProfileIn( __METHOD__."-execute" );
                $res = $tpl->execute();
-               wfProfileOut( "$fname-execute" );
+               wfProfileOut( __METHOD__."-execute" );
 
                // result may be an error
                $this->printOrError( $res );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -465,7 +470,7 @@ class SkinTemplate extends Skin {
         * @param mixed $str
         * @private
         */
-       function printOrError( &$str ) {
+       function printOrError( $str ) {
                echo $str;
        }
 
@@ -475,11 +480,10 @@ class SkinTemplate extends Skin {
         * @private
         */
        function buildPersonalUrls() {
-               global $wgTitle, $wgShowIPinHeader;
+               global $wgTitle, $wgRequest;
 
-               $fname = 'SkinTemplate::buildPersonalUrls';
                $pageurl = $wgTitle->getLocalURL();
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
@@ -500,29 +504,51 @@ class SkinTemplate extends Skin {
                        $href = self::makeSpecialUrl( 'Preferences' );
                        $personal_urls['preferences'] = array(
                                'text' => wfMsg( 'mypreferences' ),
-                               'href' => self::makeSpecialUrl( 'Preferences' ),
+                               'href' => $href,
                                'active' => ( $href == $pageurl )
                        );
                        $href = self::makeSpecialUrl( 'Watchlist' );
                        $personal_urls['watchlist'] = array(
-                               'text' => wfMsg( 'watchlist' ),
+                               'text' => wfMsg( 'mywatchlist' ),
                                'href' => $href,
                                'active' => ( $href == $pageurl )
                        );
-                       $href = self::makeSpecialUrl( "Contributions/$this->username" );
+
+                       # We need to do an explicit check for Special:Contributions, as we
+                       # have to match both the title, and the target (which could come
+                       # from request values or be specified in "sub page" form. The plot
+                       # thickens, because $wgTitle is altered for special pages, so doesn't
+                       # contain the original alias-with-subpage.
+                       $title = Title::newFromText( $wgRequest->getText( 'title' ) );
+                       if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
+                               list( $spName, $spPar ) =
+                                       SpecialPage::resolveAliasWithSubpage( $title->getText() );
+                               $active = $spName == 'Contributions'
+                                       && ( ( $spPar && $spPar == $this->username )
+                                               || $wgRequest->getText( 'target' ) == $this->username );
+                       } else {
+                               $active = false;
+                       }
+
+                       $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username );
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg( 'mycontris' ),
-                               'href' => $href
-                               # FIXME #  'active' => ( $href == $pageurl . '/' . $this->username )
+                               'href' => $href,
+                               'active' => $active
                        );
                        $personal_urls['logout'] = array(
                                'text' => wfMsg( 'userlogout' ),
                                'href' => self::makeSpecialUrl( 'Userlogout',
                                        $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
-                               )
+                               ),
+                               'active' => false
                        );
                } else {
-                       if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] ) ) {
+                       global $wgUser;
+                       $loginlink = $wgUser->isAllowed( 'createaccount' )
+                               ? 'nav-login-createaccount'
+                               : 'login';
+                       if( $this->showIPinHeader() ) {
                                $href = &$this->userpageUrlDetails['href'];
                                $personal_urls['anonuserpage'] = array(
                                        'text' => $this->username,
@@ -539,39 +565,31 @@ class SkinTemplate extends Skin {
                                        'active' => ( $pageurl == $href )
                                );
                                $personal_urls['anonlogin'] = array(
-                                       'text' => wfMsg('userlogin'),
+                                       'text' => wfMsg( $loginlink ),
                                        'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
-                                       'active' => $wgTitle->isSpecial( 'Userlogin' ) 
+                                       'active' => $wgTitle->isSpecial( 'Userlogin' )
                                );
                        } else {
 
                                $personal_urls['login'] = array(
-                                       'text' => wfMsg('userlogin'),
+                                       'text' => wfMsg( $loginlink ),
                                        'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
                                        'active' => $wgTitle->isSpecial( 'Userlogin' )
                                );
                        }
                }
 
-               wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );              
-               wfProfileOut( $fname );
+               wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
+               wfProfileOut( __METHOD__ );
                return $personal_urls;
        }
 
-       /**
-        * Returns true if the IP should be shown in the header
-        */
-       function showIPinHeader() {
-               global $wgShowIPinHeader;
-               return $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] );
-       }
-
        function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) {
                $classes = array();
                if( $selected ) {
                        $classes[] = 'selected';
                }
-               if( $checkEdit && $title->getArticleId() == 0 ) {
+               if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 ) {
                        $classes[] = 'new';
                        $query = 'action=edit';
                }
@@ -579,7 +597,14 @@ class SkinTemplate extends Skin {
                $text = wfMsg( $message );
                if ( wfEmptyMsg( $message, $text ) ) {
                        global $wgContLang;
-                       $text = $wgContLang->getFormattedNsText( Namespace::getSubject( $title->getNamespace() ) );
+                       $text = $wgContLang->getFormattedNsText( MWNamespace::getSubject( $title->getNamespace() ) );
+               }
+
+               $result = array();
+               if( !wfRunHooks('SkinTemplateTabAction', array(&$this,
+                               $title, $message, $selected, $checkEdit,
+                               &$classes, &$query, &$text, &$result)) ) {
+                       return $result;
                }
 
                return array(
@@ -590,6 +615,9 @@ class SkinTemplate extends Skin {
 
        function makeTalkUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
+               if( !is_object($title) ) {
+                       throw new MWException( __METHOD__." given invalid pagename $name" );
+               }
                $title = $title->getTalkPage();
                self::checkTitle( $title, $name );
                return array(
@@ -614,9 +642,8 @@ class SkinTemplate extends Skin {
         * @private
         */
        function buildContentActionUrls () {
-               global $wgContLang, $wgOut;
-               $fname = 'SkinTemplate::buildContentActionUrls';
-               wfProfileIn( $fname );
+               global $wgContLang, $wgLang, $wgOut;
+               wfProfileIn( __METHOD__ );
 
                global $wgUser, $wgRequest;
                $action = $wgRequest->getText( 'action' );
@@ -644,13 +671,15 @@ class SkinTemplate extends Skin {
                                '',
                                true);
 
-                       wfProfileIn( "$fname-edit" );
-                       if ( $this->mTitle->userCanEdit() && ( $this->mTitle->exists() || $this->mTitle->userCanCreate() ) ) {
+                       wfProfileIn( __METHOD__."-edit" );
+                       if ( $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' => wfMsg('edit'),
+                                       'text' => $this->mTitle->exists()
+                                               ? wfMsg( 'edit' )
+                                               : wfMsg( 'create' ),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
 
@@ -661,16 +690,16 @@ class SkinTemplate extends Skin {
                                                'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
                                        );
                                }
-                       } else {
+                       } elseif ( $this->mTitle->exists() || $this->mTitle->isAlwaysKnown() ) {
                                $content_actions['viewsource'] = array(
                                        'class' => ($action == 'edit') ? 'selected' : false,
                                        'text' => wfMsg('viewsource'),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
                        }
-                       wfProfileOut( "$fname-edit" );
+                       wfProfileOut( __METHOD__."-edit" );
 
-                       wfProfileIn( "$fname-live" );
+                       wfProfileIn( __METHOD__."-live" );
                        if ( $this->mTitle->getArticleId() ) {
 
                                $content_actions['history'] = array(
@@ -679,6 +708,22 @@ class SkinTemplate extends Skin {
                                        'href' => $this->mTitle->getLocalUrl( 'action=history')
                                );
 
+                               if($wgUser->isAllowed('delete')){
+                                       $content_actions['delete'] = array(
+                                               'class' => ($action == 'delete') ? 'selected' : false,
+                                               'text' => wfMsg('delete'),
+                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
+                                       );
+                               }
+                               if ( $this->mTitle->quickUserCan( 'move' ) ) {
+                                       $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
+                                       $content_actions['move'] = array(
+                                               'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
+                                               'text' => wfMsg('move'),
+                                               'href' => $moveTitle->getLocalUrl()
+                                       );
+                               }
+
                                if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
                                        if(!$this->mTitle->isProtected()){
                                                $content_actions['protect'] = array(
@@ -695,36 +740,39 @@ class SkinTemplate extends Skin {
                                                );
                                        }
                                }
-                               if($wgUser->isAllowed('delete')){
-                                       $content_actions['delete'] = array(
-                                               'class' => ($action == 'delete') ? 'selected' : false,
-                                               'text' => wfMsg('delete'),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
-                                       );
-                               }
-                               if ( $this->mTitle->userCanMove()) {
-                                       $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
-                                       $content_actions['move'] = array(
-                                               'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
-                                               'text' => wfMsg('move'),
-                                               'href' => $moveTitle->getLocalUrl()
-                                       );
-                               }
                        } else {
                                //article doesn't exist or is deleted
-                               if( $wgUser->isAllowed( 'delete' ) ) {
+                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) {
                                        if( $n = $this->mTitle->isDeleted() ) {
                                                $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
                                                $content_actions['undelete'] = array(
                                                        'class' => false,
-                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $n ),
+                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum($n) ),
                                                        'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
                                                        #'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
                                                );
                                        }
                                }
+
+                               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' )
+                                               );
+                                       }
+                               }
                        }
-                       wfProfileOut( "$fname-live" );
+
+                       wfProfileOut( __METHOD__."-live" );
 
                        if( $this->loggedin ) {
                                if( !$this->mTitle->userIsWatching()) {
@@ -742,13 +790,14 @@ class SkinTemplate extends Skin {
                                }
                        }
 
+
                        wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) )   ;
                } else {
                        /* show special page tab */
 
                        $content_actions[$this->mTitle->getNamespaceKey()] = array(
                                'class' => 'selected',
-                               'text' => wfMsg('specialpage'),
+                               'text' => wfMsg('nstab-special'),
                                'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
                        );
 
@@ -760,9 +809,6 @@ class SkinTemplate extends Skin {
                $variants = $wgContLang->getVariants();
                if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
                        $preferred = $wgContLang->getPreferredVariant();
-                       $actstr = '';
-                       if( $action )
-                               $actstr = 'action=' . $action . '&';
                        $vcount=0;
                        foreach( $variants as $code ) {
                                $varname = $wgContLang->getVariantname( $code );
@@ -780,7 +826,7 @@ class SkinTemplate extends Skin {
 
                wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $content_actions;
        }
 
@@ -792,20 +838,15 @@ class SkinTemplate extends Skin {
         * @private
         */
        function buildNavUrls () {
-               global $wgUseTrackbacks, $wgTitle, $wgArticle;
-
-               $fname = 'SkinTemplate::buildNavUrls';
-               wfProfileIn( $fname );
-
-               global $wgUser, $wgRequest;
+               global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
                global $wgEnableUploads, $wgUploadNavigationUrl;
 
+               wfProfileIn( __METHOD__ );
+
                $action = $wgRequest->getText( 'action' );
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
 
                $nav_urls = array();
-               $nav_urls['mainpage'] = array( 'href' => self::makeI18nUrl( 'mainpage') );
+               $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
                if( $wgEnableUploads ) {
                        if ($wgUploadNavigationUrl) {
                                $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
@@ -820,32 +861,28 @@ class SkinTemplate extends Skin {
                }
                $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
 
+               // default permalink to being off, will override it as required below.
+               $nav_urls['permalink'] = false;
 
                // A print stylesheet is attached to all pages, but nobody ever
                // figures that out. :)  Add a link...
                if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
-                       $revid = $wgArticle ? $wgArticle->getLatest() : 0;
-                       if ( !( $revid == 0 )  )
-                               $nav_urls['print'] = array(
-                                       'text' => wfMsg( 'printableversion' ),
-                                       'href' => $wgRequest->appendQuery( 'printable=yes' )
-                               );
+                       $nav_urls['print'] = array(
+                               'text' => wfMsg( 'printableversion' ),
+                               'href' => $wgRequest->appendQuery( 'printable=yes' )
+                       );
 
                        // Also add a "permalink" while we're at it
-                       if ( (int)$oldid ) {
+                       if ( $this->mRevisionId ) {
                                $nav_urls['permalink'] = array(
                                        'text' => wfMsg( 'permalink' ),
-                                       'href' => ''
+                                       'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
                                );
-                       } else {
-                               if ( !( $revid == 0 )  )
-                                       $nav_urls['permalink'] = array(
-                                               'text' => wfMsg( 'permalink' ),
-                                               'href' => $wgTitle->getLocalURL( "oldid=$revid" )
-                                       );
                        }
 
-                       wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$oldid, &$revid ) );
+                       // Copy in case this undocumented, shady hook tries to mess with internals
+                       $revid = $this->mRevisionId;
+                       wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$revid, &$revid ) );
                }
 
                if( $this->mTitle->getNamespace() != NS_SPECIAL ) {
@@ -858,6 +895,8 @@ class SkinTemplate extends Skin {
                                $nav_urls['recentchangeslinked'] = array(
                                        'href' => $rclTitle->getLocalUrl()
                                );
+                       } else {
+                               $nav_urls['recentchangeslinked'] = false;
                        }
                        if ($wgUseTrackbacks)
                                $nav_urls['trackbacklink'] = array(
@@ -873,24 +912,38 @@ class SkinTemplate extends Skin {
                        $ip = false;
                }
 
-               if($id || $ip) { # both anons and non-anons have contri list
+               if($id || $ip) { # both anons and non-anons have contribs list
                        $nav_urls['contributions'] = array(
-                               'href' => self::makeSpecialUrl( 'Contributions/' . $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
                        );
-                       if ( $wgUser->isAllowed( 'block' ) )
+
+                       if( $id ) {
+                               $logPage = SpecialPage::getTitleFor( 'Log' );
+                               $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
+                                       . $this->mTitle->getPartialUrl() ) );
+                       } else {
+                               $nav_urls['log'] = false;
+                       }
+
+                       if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrl( 'Blockip/' . $this->mTitle->getText() )
+                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
                                );
+                       } else {
+                               $nav_urls['blockip'] = false;
+                       }
                } else {
                        $nav_urls['contributions'] = false;
+                       $nav_urls['log'] = false;
+                       $nav_urls['blockip'] = false;
                }
                $nav_urls['emailuser'] = false;
                if( $this->showEmailUser( $id ) ) {
                        $nav_urls['emailuser'] = array(
-                               'href' => self::makeSpecialUrl( 'Emailuser/' . $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
                        );
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $nav_urls;
        }
 
@@ -907,8 +960,7 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupUserCss() {
-               $fname = 'SkinTemplate::setupUserCss';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
@@ -939,7 +991,7 @@ class SkinTemplate extends Skin {
                        $siteargs .= '&ts=' . $wgUser->mTouched;
                }
 
-               if( $wgContLang->isRTL() ) {
+               if( $wgContLang->isRTL() && in_array( 'rtl', $this->cssfiles ) ) {
                        global $wgStyleVersion;
                        $sitecss .= "@import \"$wgStylePath/$this->stylename/rtl.css?$wgStyleVersion\";\n";
                }
@@ -947,9 +999,12 @@ class SkinTemplate extends Skin {
                # If we use the site's dynamic CSS, throw that in, too
                if ( $wgUseSiteCss ) {
                        $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
+                       $skinquery = '';
+                       if (($us = $wgRequest->getVal('useskin', '')) !== '')
+                               $skinquery = "&useskin=$us";
                        $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n";
                        $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n";
-                       $sitecss .= '@import "' . self::makeUrl( '-', 'action=raw&gen=css' . $siteargs ) . '";' . "\n";
+                       $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n";
                }
 
                # If we use any dynamic CSS, make a little CDATA block out of it.
@@ -957,28 +1012,27 @@ class SkinTemplate extends Skin {
                if ( !empty($sitecss) || !empty($usercss) ) {
                        $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
         * @private
         */
-       function setupUserJs() {
-               $fname = 'SkinTemplate::setupUserJs';
-               wfProfileIn( $fname );
+       function setupUserJs( $allowUserJs ) {
+               wfProfileIn( __METHOD__ );
 
-               global $wgRequest, $wgAllowUserJs, $wgJsMimeType;
+               global $wgRequest, $wgJsMimeType;
                $action = $wgRequest->getText('action');
 
-               if( $wgAllowUserJs && $this->loggedin ) {
+               if( $allowUserJs && $this->loggedin ) {
                        if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
                                # XXX: additional security check/prompt?
                                $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
                        } else {
-                               $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s');
+                               $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType);
                        }
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -988,41 +1042,54 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupPageCss() {
-               $fname = 'SkinTemplate::setupPageCss';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
                $out = false;
                wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
-               
-               wfProfileOut( $fname );
+
+               wfProfileOut( __METHOD__ );
                return $out;
        }
 
        /**
         * returns css with user-specific options
-        * @public
         */
-
-       function getUserStylesheet() {
-               $fname = 'SkinTemplate::getUserStylesheet';
-               wfProfileIn( $fname );
+       public function getUserStylesheet() {
+               wfProfileIn( __METHOD__ );
 
                $s = "/* generated user stylesheet */\n";
                $s .= $this->reallyDoGetUserStyles();
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $s;
        }
 
        /**
-        * @public
+        * Returns the print stylesheet for this skin.  In all default skins this
+        * is just commonPrint.css, but third-party skins may want to modify it.
+        *
+        * @return string
         */
-       function getUserJs() {
-               $fname = 'SkinTemplate::getUserJs';
-               wfProfileIn( $fname );
-
+       protected function getPrintCss() {
                global $wgStylePath;
-               $s = '/* generated javascript */';
-               $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';";
-               $s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n";
+               return $wgStylePath . "/common/commonPrint.css";
+       }
+
+       /**
+        * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
+        * nated together.  For some bizarre reason, it does *not* return any
+        * custom user JS from subpages.  Huh?
+        *
+        * There's absolutely no reason to have separate Monobook/Common JSes.
+        * Any JS that cares can just check the skin variable generated at the
+        * top.  For now Monobook.js will be maintained, but it should be consi-
+        * dered deprecated.
+        *
+        * @return string
+        */
+       public function getUserJs() {
+               wfProfileIn( __METHOD__ );
+
+               $s = parent::getUserJs();
+               $s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js */\n";
 
                // avoid inclusion of non defined user JavaScript (with custom skins only)
                // by checking for default message content
@@ -1032,7 +1099,7 @@ class SkinTemplate extends Skin {
                        $s .= $userJS;
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $s;
        }
 }
@@ -1040,8 +1107,7 @@ class SkinTemplate extends Skin {
 /**
  * Generic wrapper for template functions, with interface
  * compatible with what we use of PHPTAL 0.7.
- * @package MediaWiki
- * @subpackage Skins
+ * @ingroup Skins
  */
 class QuickTemplate {
        /**
@@ -1133,7 +1199,7 @@ class QuickTemplate {
         * @private
         */
        function haveData( $str ) {
-               return $this->data[$str];
+               return isset( $this->data[$str] );
        }
 
        /**
@@ -1144,4 +1210,3 @@ class QuickTemplate {
                return ($msg != '-') && ($msg != ''); # ????
        }
 }
-?>