r60778 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r60777‎ | r60778 | r60779 >
Date:07:32, 7 January 2010
Author:robla
Status:deferred
Tags:
Comment:
Some extra file deletion debug logging (probably superfluous)
This is the last commit of the patches listed in bug 4421. Revs 60770-60773
are the essential parts of the feature, and 60774 through this rev
are extra unrelated things.
Modified paths:
  • /branches/extensionless-files/includes/filerepo/FSRepo.php (modified) (history)

Diff [purge]

Index: branches/extensionless-files/includes/filerepo/FSRepo.php
@@ -518,17 +518,21 @@
519519 $srcPath = "{$this->directory}/$srcRel";
520520 $archivePath = "{$this->deletedDir}/$archiveRel";
521521 $good = true;
 522+ wfDebugLog( 'filedelete',__METHOD__.": moving {$srcPath} to {$archiveRel}");
522523 if ( file_exists( $archivePath ) ) {
523524 # A file with this content hash is already archived
524525 if ( !@unlink( $srcPath ) ) {
 526+ wfDebugLog( 'filedelete',__METHOD__.": filedeleteerror {$srcPath}");
525527 $status->error( 'filedeleteerror', $srcPath );
526528 $good = false;
527529 }
528530 } else{
529531 if ( !@rename( $srcPath, $archivePath ) ) {
 532+ wfDebugLog( 'filedelete',__METHOD__.": filerenameerror srcPath: {$srcPath} archivePath: {$archivePath}");
530533 $status->error( 'filerenameerror', $srcPath, $archivePath );
531534 $good = false;
532535 } else {
 536+ wfDebugLog( 'filedelete',__METHOD__.": success creating {$archivePath}");
533537 $this->chmod( $archivePath );
534538 }
535539 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r60779Adding forgotten patch-img_file_ext.sql. Critical for bug 4421 fixrobla07:41, 7 January 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r60762Development branch for bug 4421 (Image file extension should not be part of t...robla03:14, 7 January 2010
r60772Adding new functions in preparation for decoupling page title from MIME type ...robla07:13, 7 January 2010
r60773Decouple page titles from MIME type, adding img_file_ext field to db (bug 4421robla07:15, 7 January 2010

Status & tagging log