From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 14 Apr 2011 18:46:37 +0000 (+0000)
Subject: Ensure $collationConds is defined on all paths
X-Git-Tag: 1.31.0-rc.0~30839
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=fa7662d94ad72e3d15391fccf69dfee2b17ebacd;p=lhc%2Fweb%2Fwiklou.git

Ensure $collationConds is defined on all paths
---

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 01483a1e97..8cbea5b50a 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -67,6 +67,7 @@ TEXT;
 
 		if ( $force ) {
 			$options['ORDER BY'] = 'cl_from, cl_to';
+			$collationConds = array();
 		} else {
 			$collationConds = array( 0 => 
 				'cl_collation != ' . $dbw->addQuotes( $wgCategoryCollation ) );