API: added query parameter indexpageids to list the page ids of all returned page...

[lhc/web/wiklou.git] / includes / SkinTemplate.php

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index cddd219..2f61a0b 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -179,7 +179,7 @@ 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" );
 
@@ -591,7 +591,7 @@ class SkinTemplate extends Skin {
                if( $selected ) {
                        $classes[] = 'selected';
                }
-               if( $checkEdit && $title->getArticleId() == 0 ) {
+               if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 ) {
                        $classes[] = 'new';
                        $query = 'action=edit';
                }
@@ -822,7 +822,6 @@ class SkinTemplate extends Skin {
                global $wgEnableUploads, $wgUploadNavigationUrl;
 
                $action = $wgRequest->getText( 'action' );
-               $oldid = $wgRequest->getVal( 'oldid' );
 
                $nav_urls = array();
                $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
@@ -852,21 +851,16 @@ class SkinTemplate extends Skin {
                        );
 
                        // 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 {
-                               $revid = $wgArticle ? $wgArticle->getLatest() : 0;
-                               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 ) {
@@ -974,9 +968,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.
@@ -990,14 +987,14 @@ class SkinTemplate extends Skin {
        /**
         * @private
         */
-       function setupUserJs() {
+       function setupUserJs( $allowUserJs ) {
                $fname = 'SkinTemplate::setupUserJs';
                wfProfileIn( $fname );
 
-               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') . ' /*]]>*/';