From: Nicolas Dumazet <nicdumz@users.mediawiki.org>
Date: Fri, 4 Jul 2008 10:24:20 +0000 (+0000)
Subject: 6 array_diff_* were computed twice. Compute once, and remember them instead.
X-Git-Tag: 1.31.0-rc.0~46751
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=da8cfb32cf4453a10ecb092cc8175f4743beea02;p=lhc%2Fweb%2Fwiklou.git

6 array_diff_* were computed twice. Compute once, and remember them instead.
---

diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php
index 202ef6e588..7cf74530c1 100644
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@ -97,11 +97,13 @@ class LinksUpdate {
 
 		# Image links
 		$existing = $this->getExistingImages();
-		$this->incrTableUpdate( 'imagelinks', 'il', $this->getImageDeletions( $existing ),
-			$this->getImageInsertions( $existing ) );
+
+		$imageDeletes = $this->getImageDeletions( $existing );
+		$imageInserts = $this->getImageInsertions( $existing );
+		$this->incrTableUpdate( 'imagelinks', 'il', $imageDeletes, $imageInserts );
 
 		# Invalidate all image description pages which had links added or removed
-		$imageUpdates = array_diff_key( $existing, $this->mImages ) + array_diff_key( $this->mImages, $existing );
+		$imageUpdates = $imageDeletions + $imageInsertions
 		$this->invalidateImageDescriptions( $imageUpdates );
 
 		# External links
@@ -121,23 +123,27 @@ class LinksUpdate {
 
 		# Category links
 		$existing = $this->getExistingCategories();
-		$this->incrTableUpdate( 'categorylinks', 'cl', $this->getCategoryDeletions( $existing ),
-			$this->getCategoryInsertions( $existing ) );
+
+		$categoryDeletes = $this->getCategoryDeletions( $existing );
+		$categoryInserts = $this->getCategoryInsertions( $existing );
+
+		$this->incrTableUpdate( 'categorylinks', 'cl', $categoryDeletes, $categoryInserts );
 
 		# Invalidate all categories which were added, deleted or changed (set symmetric difference)
-		$categoryInserts = array_diff_assoc( $this->mCategories, $existing );
-		$categoryDeletes = array_diff_assoc( $existing, $this->mCategories );
 		$categoryUpdates = $categoryInserts + $categoryDeletes;
 		$this->invalidateCategories( $categoryUpdates );
 		$this->updateCategoryCounts( $categoryInserts, $categoryDeletes );
 
 		# Page properties
 		$existing = $this->getExistingProperties();
-		$this->incrTableUpdate( 'page_props', 'pp', $this->getPropertyDeletions( $existing ),
-			$this->getPropertyInsertions( $existing ) );
+
+		$propertiesDeletes = $this->getPropertiesDeletions( $existing );
+		$propertiesInserts = $this->getPropertiesInsertions( $existing );
+
+		$this->incrTableUpdate( 'page_props', 'pp', $propertiesDeletes, $propertiesInserts );
 
 		# Invalidate the necessary pages
-		$changed = array_diff_assoc( $existing, $this->mProperties ) + array_diff_assoc( $this->mProperties, $existing );
+		$changed = $propertiesDeletes + $propertiesInserts;
 		$this->invalidateProperties( $changed );
 
 		# Refresh links of all pages including this page