| Index: trunk/phase3/tests/phpunit/includes/api/RandomImageGenerator.php |
| — | — | @@ -35,7 +35,6 @@ |
| 36 | 36 | private $imageWriteMethod; |
| 37 | 37 | |
| 38 | 38 | public function __construct( $options = array() ) { |
| 39 | | - global $wgUseImageMagick, $wgImageMagickConvertCommand; |
| 40 | 39 | foreach ( array( 'dictionaryFile', 'minWidth', 'minHeight', 'maxHeight', 'circlesToDraw' ) as $property ) { |
| 41 | 40 | if ( isset( $options[$property] ) ) { |
| 42 | 41 | $this->$property = $options[$property]; |
| — | — | @@ -79,6 +78,7 @@ |
| 80 | 79 | * @param $format (a typical extension like 'svg', 'jpg', etc.) |
| 81 | 80 | */ |
| 82 | 81 | function getImageWriteMethod( $format ) { |
| | 82 | + global $wgUseImageMagick, $wgImageMagickConvertCommand; |
| 83 | 83 | if ( $format === 'svg' ) { |
| 84 | 84 | return 'writeSvg'; |
| 85 | 85 | } else { |