Minor revert to r91246
authorSam Reed <reedy@users.mediawiki.org>
Fri, 1 Jul 2011 02:28:08 +0000 (02:28 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Fri, 1 Jul 2011 02:28:08 +0000 (02:28 +0000)
includes/ImagePage.php
includes/diff/DifferenceEngine.php

index e6090f2..ebbe36c 100644 (file)
@@ -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();
index f0345c4..4e8194a 100644 (file)
@@ -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(