| Index: branches/wmf/1.18wmf1/extensions/VipsScaler/modules/ext.vipsScaler/ext.vipsScaler.js |
| — | — | @@ -1,4 +1,5 @@ |
| 2 | | -jQuery( function( $ ) { |
| | 2 | +jQuery( window ).load( ( function( $ ) { |
| | 3 | + return function( event ) { |
| 3 | 4 | $.vipsScaler = { |
| 4 | 5 | /** function to alternate between both thumbnails */ |
| 5 | 6 | switchThumbs: function() { |
| — | — | @@ -51,5 +52,6 @@ |
| 52 | 53 | function() { $.vipsScaler.switchThumbs(); } |
| 53 | 54 | ); |
| 54 | 55 | } |
| 55 | | -} |
| | 56 | +}; |
| | 57 | +} )( jQuery ) |
| 56 | 58 | ); |
| Index: branches/wmf/1.18wmf1/extensions/VipsScaler/VipsScaler_body.php |
| — | — | @@ -400,9 +400,8 @@ |
| 401 | 401 | */ |
| 402 | 402 | public function execute() { |
| 403 | 403 | # Build and escape the command string |
| 404 | | - $cmd = |
| 405 | | - 'IM_CONCURRENCY=1 ' . |
| 406 | | - wfEscapeShellArg( |
| | 404 | + $env = array( 'IM_CONCURRENCY' => '1' ); |
| | 405 | + $cmd = wfEscapeShellArg( |
| 407 | 406 | $this->vips, |
| 408 | 407 | array_shift( $this->args ), |
| 409 | 408 | $this->input, $this->output |
| — | — | @@ -416,7 +415,7 @@ |
| 417 | 416 | |
| 418 | 417 | # Execute |
| 419 | 418 | $retval = 0; |
| 420 | | - $this->err = wfShellExec( $cmd, $retval ); |
| | 419 | + $this->err = wfShellExec( $cmd, $retval, $env ); |
| 421 | 420 | |
| 422 | 421 | # Cleanup temp file |
| 423 | 422 | if ( $this->removeInput ) { |
| Property changes on: branches/wmf/1.18wmf1/extensions/VipsScaler |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 424 | 423 | Merged /trunk/extensions/VipsScaler:r104733,104735 |