Fix duplicate array key of fa_deleted in LocalFile
authorReedy <reedy@wikimedia.org>
Sat, 7 Apr 2012 16:11:02 +0000 (17:11 +0100)
committerReedy <reedy@wikimedia.org>
Sat, 7 Apr 2012 16:11:19 +0000 (17:11 +0100)
Change-Id: I027f902d47616d896df8efba29d25457e4ac3e73

includes/filerepo/file/LocalFile.php

index 40ee0fa..058a0f3 100644 (file)
@@ -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__ );
                }
        }