From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 26 Oct 2012 22:01:01 +0000 (-0700)
Subject: Avoid duplicate "null" change journal entries.
X-Git-Tag: 1.31.0-rc.0~21843
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=5c34a2c361e88c636035e52cbcd33a4e30e251db;p=lhc%2Fweb%2Fwiklou.git

Avoid duplicate "null" change journal entries.

Change-Id: Ie5625963d4755b7aa7b3ecf3aaca0eb9e9e22cf5
---

diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php
index 7c43c48908..3c33f24af9 100644
--- a/includes/filebackend/FileOp.php
+++ b/includes/filebackend/FileOp.php
@@ -179,7 +179,7 @@ abstract class FileOp {
 		$updateEntries = array();
 		$deleteEntries = array();
 		$pathsUsed = array_merge( $this->storagePathsRead(), $this->storagePathsChanged() );
-		foreach ( $pathsUsed as $path ) {
+		foreach ( array_unique( $pathsUsed ) as $path ) {
 			$nullEntries[] = array( // assertion for recovery
 				'op'      => 'null',
 				'path'    => $path,