r57602 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r57601‎ | r57602 | r57603 >
Date:02:12, 10 October 2009
Author:aaron
Status:ok
Tags:
Comment:
Fill in class names for r57530
Modified paths:
  • /trunk/phase3/includes/LogEventsList.php (modified) (history)
  • /trunk/phase3/includes/filerepo/ArchivedFile.php (modified) (history)
  • /trunk/phase3/includes/filerepo/OldLocalFile.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/filerepo/OldLocalFile.php
@@ -198,9 +198,9 @@
199199 if( isset($this->deleted) && ($this->deleted & $field) ) {
200200 global $wgUser;
201201 $permission = '';
202 - if ( $this->deleted & self::DELETED_RESTRICTED ) {
 202+ if ( $this->deleted & File::DELETED_RESTRICTED ) {
203203 $permission = 'suppressrevision';
204 - } elseif ( $field & self::DELETED_TEXT ) {
 204+ } elseif ( $field & File::DELETED_TEXT ) {
205205 $permission = 'deletedtext';
206206 } else {
207207 $permission = 'deletedhistory';
Index: trunk/phase3/includes/filerepo/ArchivedFile.php
@@ -380,9 +380,9 @@
381381 if( $this->deleted & $field ) {
382382 global $wgUser;
383383 $permission = '';
384 - if ( $this->deleted & self::DELETED_RESTRICTED ) {
 384+ if ( $this->deleted & File::DELETED_RESTRICTED ) {
385385 $permission = 'suppressrevision';
386 - } elseif ( $field & self::DELETED_TEXT ) {
 386+ } elseif ( $field & File::DELETED_TEXT ) {
387387 $permission = 'deletedtext';
388388 } else {
389389 $permission = 'deletedhistory';
Index: trunk/phase3/includes/LogEventsList.php
@@ -550,9 +550,9 @@
551551 if( $row->log_deleted & $field ) {
552552 global $wgUser;
553553 $permission = '';
554 - if ( $this->log_deleted & self::DELETED_RESTRICTED ) {
 554+ if ( $this->log_deleted & LogPage::DELETED_RESTRICTED ) {
555555 $permission = 'suppressrevision';
556 - } elseif ( $field & self::DELETED_TEXT ) {
 556+ } elseif ( $field & LogPage::DELETED_TEXT ) {
557557 $permission = 'deletedtext';
558558 } else {
559559 $permission = 'deletedhistory';

Follow-up revisions

RevisionCommit summaryAuthorDate
r57603merged r57602aaron02:15, 10 October 2009
r57755Follow-up to r57602, change DELETED_TEXT to DELETED_FILE, there is no such cl...werdna09:26, 15 October 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r57530Replace broken nested terneries (causing a nasty bug where all admins could v...werdna19:40, 8 October 2009

Status & tagging log