From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 1 Jul 2011 02:28:08 +0000 (+0000)
Subject: Minor revert to r91246
X-Git-Tag: 1.31.0-rc.0~29129
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=9b850aa604f0d6981e75691420c60dec2ae9aee9;p=lhc%2Fweb%2Fwiklou.git

Minor revert to r91246
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index e6090f2735..ebbe36ca6c 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -879,7 +879,7 @@ class ImageHistoryList {
 	 */
 	public function __construct( $imagePage ) {
 		global $wgUser, $wgShowArchiveThumbnails;
-		$this->skin = $this->getSkin();
+		$this->skin = $wgUser->getSkin();
 		$this->current = $imagePage->getFile();
 		$this->img = $imagePage->getDisplayedFile();
 		$this->title = $imagePage->getTitle();
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index f0345c4cc9..4e8194aaa3 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -482,7 +482,7 @@ CONTROL;
 		// (a) the user can delete revisions, or
 		// (b) the user can view deleted revision *and* this one is deleted
 		if ( $canHide || ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) {
-			$sk = $this->getSkin();
+			$sk = $wgUser->getSkin();
 			if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
 				$link = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
 			} else {
@@ -550,7 +550,7 @@ CONTROL;
 		}
 		# Add redundant patrol link on bottom...
 		if ( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan( 'patrol' ) ) {
-			$sk = $this->getSkin();
+			$sk = $wgUser->getSkin();
 			$token = $wgUser->editToken( $this->mRcidMarkPatrolled );
 			$wgOut->preventClickjacking();
 			$wgOut->addHTML(