summaryrefslogtreecommitdiff
path: root/includes/SkinTemplate.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/SkinTemplate.php')
-rw-r--r--includes/SkinTemplate.php60
1 files changed, 34 insertions, 26 deletions
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index cddd2195..6ce40606 100644
--- 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" );
@@ -285,11 +285,11 @@ class SkinTemplate extends Skin {
$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);
}
@@ -440,7 +440,8 @@ 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);
}
@@ -591,7 +592,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 +823,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 +852,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 ) {
@@ -896,10 +891,19 @@ 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::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
);
+
+ 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::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
@@ -909,6 +913,7 @@ class SkinTemplate extends Skin {
}
} else {
$nav_urls['contributions'] = false;
+ $nav_urls['log'] = false;
$nav_urls['blockip'] = false;
}
$nav_urls['emailuser'] = false;
@@ -974,9 +979,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 +998,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') . ' /*]]>*/';
@@ -1177,4 +1185,4 @@ class QuickTemplate {
return ($msg != '-') && ($msg != ''); # ????
}
}
-?>
+