From: Reedy <reedy@wikimedia.org>
Date: Thu, 17 May 2012 23:48:58 +0000 (+0000)
Subject: Merge "[FileBackend] Fixed parallelize check in doQuickOperationsInternal()."
X-Git-Tag: 1.31.0-rc.0~23579
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=d34e01c12da731cf301f6102c1ec73291d658bca;p=lhc%2Fweb%2Fwiklou.git

Merge "[FileBackend] Fixed parallelize check in doQuickOperationsInternal()."
---

d34e01c12da731cf301f6102c1ec73291d658bca
diff --cc includes/filerepo/backend/FileBackendStore.php
index 62c32ebae6,8593423a8f..9e0bc8ed5f
--- a/includes/filerepo/backend/FileBackendStore.php
+++ b/includes/filerepo/backend/FileBackendStore.php
@@@ -943,11 -943,9 +943,11 @@@ abstract class FileBackendStore extend
  	 * @throws MWException
  	 */
  	final protected function doQuickOperationsInternal( array $ops ) {
 +		wfProfileIn( __METHOD__ );
 +		wfProfileIn( __METHOD__ . '-' . $this->name );
  		$status = Status::newGood();
  
- 		$async = $this->parallelize;
+ 		$async = ( $this->parallelize === 'implicit' );
  		$maxConcurrency = $this->concurrency; // throttle
  
  		$statuses = array(); // array of (index => Status)