r57757 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r57756‎ | r57757 | r57758 >
Date:09:28, 15 October 2009
Author:werdna
Status:ok
Tags:
Comment:
Merge r57755, fix for fatal errors caused by using the wrong class constant.
Modified paths:
  • /branches/wmf-deployment/includes/filerepo (modified) (history)
  • /branches/wmf-deployment/includes/filerepo/ArchivedFile.php (modified) (history)
  • /branches/wmf-deployment/includes/filerepo/OldLocalFile.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/includes/filerepo/OldLocalFile.php
@@ -200,7 +200,7 @@
201201 $permission = '';
202202 if ( $this->deleted & File::DELETED_RESTRICTED ) {
203203 $permission = 'suppressrevision';
204 - } elseif ( $field & File::DELETED_TEXT ) {
 204+ } elseif ( $field & File::DELETED_FILE ) {
205205 $permission = 'deletedtext';
206206 } else {
207207 $permission = 'deletedhistory';
Index: branches/wmf-deployment/includes/filerepo/ArchivedFile.php
@@ -382,7 +382,7 @@
383383 $permission = '';
384384 if ( $this->deleted & File::DELETED_RESTRICTED ) {
385385 $permission = 'suppressrevision';
386 - } elseif ( $field & File::DELETED_TEXT ) {
 386+ } elseif ( $field & File::DELETED_FILE ) {
387387 $permission = 'deletedtext';
388388 } else {
389389 $permission = 'deletedhistory';
Property changes on: branches/wmf-deployment/includes/filerepo
___________________________________________________________________
Name: svn:mergeinfo
390390 + /branches/REL1_15/phase3/includes/filerepo:51646
/branches/wmf-deployment/includes/filerepo:53381
/trunk/phase3/includes/filerepo:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57602,57755

Past revisions this follows-up on

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

Status & tagging log