From: Reedy <reedy@wikimedia.org>
Date: Sat, 7 Apr 2012 16:11:02 +0000 (+0100)
Subject: Fix duplicate array key of fa_deleted in LocalFile
X-Git-Tag: 1.31.0-rc.0~23981^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20%20%20%24self2%20.%20%20%20%22&var_mode_affiche=boucle?a=commitdiff_plain;h=eec227819699feaef3e8262a40205a16a5c6fadb;p=lhc%2Fweb%2Fwiklou.git

Fix duplicate array key of fa_deleted in LocalFile

Change-Id: I027f902d47616d896df8efba29d25457e4ac3e73
---

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 40ee0fa923..058a0f3b58 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1653,7 +1653,7 @@ class LocalFileDeleteBatch {
 					'fa_deleted_user'      => $encUserId,
 					'fa_deleted_timestamp' => $encTimestamp,
 					'fa_deleted_reason'    => $encReason,
-					'fa_deleted'		   => $this->suppress ? $bitfield : 'oi_deleted',
+					'fa_deleted'           => $this->suppress ? $bitfield : 'oi_deleted',
 
 					'fa_name'         => 'oi_name',
 					'fa_archive_name' => 'oi_archive_name',
@@ -1669,7 +1669,6 @@ class LocalFileDeleteBatch {
 					'fa_user'         => 'oi_user',
 					'fa_user_text'    => 'oi_user_text',
 					'fa_timestamp'    => 'oi_timestamp',
-					'fa_deleted'      => $bitfield
 				), $where, __METHOD__ );
 		}
 	}