From: Reedy <reedy@wikimedia.org>
Date: Fri, 18 Oct 2013 17:33:13 +0000 (+0100)
Subject: Don't blindly overwrite $options in importImages.php
X-Git-Tag: 1.31.0-rc.0~18479
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=153469a359515f794b14d83455b221e39f48b397;p=lhc%2Fweb%2Fwiklou.git

Don't blindly overwrite $options in importImages.php

Bug: 55883
Change-Id: I695e080000f6abec3ded966f12af3e25c585c3ba
---

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index cbbcf0f9e6..f6f50f8224 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -230,14 +230,14 @@ if ( $count > 0 ) {
 		} else {
 			$props = FSFile::getPropsFromPath( $file );
 			$flags = 0;
-			$options = array();
+			$publishOptions = array();
 			$handler = MediaHandler::getHandler( $props['mime'] );
 			if ( $handler ) {
-				$options['headers'] = $handler->getStreamHeaders( $props['metadata'] );
+				$publishOptions['headers'] = $handler->getStreamHeaders( $props['metadata'] );
 			} else {
-				$options['headers'] = array();
+				$publishOptions['headers'] = array();
 			}
-			$archive = $image->publish( $file, $flags, $options );
+			$archive = $image->publish( $file, $flags, $publishOptions );
 			if ( !$archive->isGood() ) {
 				echo "failed. (" .
 					$archive->getWikiText() .