r91247 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r91246‎ | r91247 | r91248 >
Date:02:28, 1 July 2011
Author:reedy
Status:ok
Tags:
Comment:
Minor revert to r91246
Modified paths:
  • /trunk/phase3/includes/ImagePage.php (modified) (history)
  • /trunk/phase3/includes/diff/DifferenceEngine.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/diff/DifferenceEngine.php
@@ -482,7 +482,7 @@
483483 // (a) the user can delete revisions, or
484484 // (b) the user can view deleted revision *and* this one is deleted
485485 if ( $canHide || ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) {
486 - $sk = $this->getSkin();
 486+ $sk = $wgUser->getSkin();
487487 if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
488488 $link = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
489489 } else {
@@ -550,7 +550,7 @@
551551 }
552552 # Add redundant patrol link on bottom...
553553 if ( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan( 'patrol' ) ) {
554 - $sk = $this->getSkin();
 554+ $sk = $wgUser->getSkin();
555555 $token = $wgUser->editToken( $this->mRcidMarkPatrolled );
556556 $wgOut->preventClickjacking();
557557 $wgOut->addHTML(
Index: trunk/phase3/includes/ImagePage.php
@@ -879,7 +879,7 @@
880880 */
881881 public function __construct( $imagePage ) {
882882 global $wgUser, $wgShowArchiveThumbnails;
883 - $this->skin = $this->getSkin();
 883+ $this->skin = $wgUser->getSkin();
884884 $this->current = $imagePage->getFile();
885885 $this->img = $imagePage->getDisplayedFile();
886886 $this->title = $imagePage->getTitle();

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r91246Change usages of $wgUser->getSkin() in special pages to use $this->getSkin()...reedy02:25, 1 July 2011

Status & tagging log