From: Neil Kandalgaonkar <neilk@users.mediawiki.org>
Date: Sun, 10 Apr 2011 22:27:52 +0000 (+0000)
Subject: followup to r85654, move global declarations
X-Git-Tag: 1.31.0-rc.0~30944
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=4ae2a98e1361fd44eca02af449223ac3a462989c;p=lhc%2Fweb%2Fwiklou.git

followup to r85654, move global declarations
---

diff --git a/tests/phpunit/includes/api/RandomImageGenerator.php b/tests/phpunit/includes/api/RandomImageGenerator.php
index 1fd00f5bb9..1e881243ce 100644
--- a/tests/phpunit/includes/api/RandomImageGenerator.php
+++ b/tests/phpunit/includes/api/RandomImageGenerator.php
@@ -35,7 +35,6 @@ class RandomImageGenerator {
 	private $imageWriteMethod;
 
 	public function __construct( $options = array() ) {
-		global $wgUseImageMagick, $wgImageMagickConvertCommand;
 		foreach ( array( 'dictionaryFile', 'minWidth', 'minHeight', 'maxHeight', 'circlesToDraw' ) as $property ) {
 			if ( isset( $options[$property] ) ) {
 				$this->$property = $options[$property];
@@ -79,6 +78,7 @@ class RandomImageGenerator {
 	 * @param $format (a typical extension like 'svg', 'jpg', etc.)
 	 */
 	function getImageWriteMethod( $format ) {
+		global $wgUseImageMagick, $wgImageMagickConvertCommand;
 		if ( $format === 'svg' ) { 
 			return 'writeSvg';
 		} else {