From: Aaron <aschulz@wikimedia.org>
Date: Wed, 16 May 2012 20:45:31 +0000 (-0700)
Subject: [FileRepo] Use faster doQuickOperations() function for thumbnails ops.
X-Git-Tag: 1.31.0-rc.0~23577^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=930c9f8060494a72ebd736aafba7302b0bcd888a;p=lhc%2Fweb%2Fwiklou.git

[FileRepo] Use faster doQuickOperations() function for thumbnails ops.

Change-Id: I8139b7f6f8533bb0dbeddba12750ab9342b2dd82
---

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 6533daec98..d3dded4f9d 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -852,14 +852,11 @@ class FileRepo {
 			$operations[] = array(
 				'op'        => 'store',
 				'src'       => $src,
-				'dst'       => $this->resolveToStoragePath( $dst ),
-				'overwrite' => true
+				'dst'       => $this->resolveToStoragePath( $dst )
 			);
 			$this->backend->prepare( array( 'dir' => dirname( $dst ) ) );
 		}
-		$status->merge( $this->backend->doOperations( $operations,
-			array( 'force' => 1, 'nonLocking' => 1, 'allowStale' => 1, 'nonJournaled' => 1 )
-		) );
+		$status->merge( $this->backend->doQuickOperations( $operations ) );
 
 		return $status;
 	}
@@ -882,9 +879,7 @@ class FileRepo {
 				'ignoreMissingSource' => true
 			);
 		}
-		$status->merge( $this->backend->doOperations( $operations,
-			array( 'force' => 1, 'nonLocking' => 1, 'allowStale' => 1, 'nonJournaled' => 1 )
-		) );
+		$status->merge( $this->backend->doQuickOperations( $operations ) );
 
 		return $status;
 	}