7958.diff
Public
Actions

Authored By

	• bzimport
	Nov 21 2014, 9:25 PM

Size

1 KB

Referenced Files

None

Subscribers

None

7958.diff
View Options

	Index: includes/Article.php
	===================================================================
	--- includes/Article.php (revision 21814)
	+++ includes/Article.php (working copy)
	@@ -721,6 +721,9 @@
	wfRunHooks( 'ArticleViewHeader', array( &$this ) );
	if ( $pcache ) {
	if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
	+ // Ensure that UI elements requiring revision ID have
	+ // the correct version information.
	+ $wgOut->setRevisionId( $this->mLatest );
	$outputDone = true;
	}
	}
	Index: includes/SkinTemplate.php
	===================================================================
	--- includes/SkinTemplate.php (revision 21814)
	+++ includes/SkinTemplate.php (working copy)
	@@ -822,7 +822,6 @@
	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 @@
	);

	// 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 ) {

File Metadata

Mime Type: text/x-diff
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2812
Default Alt Text: 7958.diff (1 KB)

7958.diffPublicActions

7958.diffView Options

File Metadata

Event Timeline

7958.diff
Public
Actions

7958.diff
View Options