From 153469a359515f794b14d83455b221e39f48b397 Mon Sep 17 00:00:00 2001 From: Reedy Date: Fri, 18 Oct 2013 18:33:13 +0100 Subject: [PATCH] Don't blindly overwrite $options in importImages.php Bug: 55883 Change-Id: I695e080000f6abec3ded966f12af3e25c585c3ba --- maintenance/importImages.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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() . -- 2.20.1