| Index: trunk/phase3/includes/filerepo/File.php |
| — | — | @@ -675,10 +675,11 @@ |
| 676 | 676 | * @param $thumbUrl string: the URL of the thumbnail file. |
| 677 | 677 | * @param $params Array: an associative array of handler-specific parameters. |
| 678 | 678 | * Typical keys are width, height and page. |
| | 679 | + * @param $flags Integer: a bitfield, may contain self::RENDER_NOW to force rendering |
| 679 | 680 | * |
| 680 | 681 | * @return MediaTransformOutput | false |
| 681 | 682 | */ |
| 682 | | - protected function maybeDoTransform( $thumbName, $thumbUrl, $params ) { |
| | 683 | + protected function maybeDoTransform( $thumbName, $thumbUrl, $params, $flags = 0 ) { |
| 683 | 684 | global $wgIgnoreImageErrors, $wgThumbnailEpoch; |
| 684 | 685 | |
| 685 | 686 | $thumbPath = $this->getThumbPath( $thumbName ); |
| — | — | @@ -751,7 +752,7 @@ |
| 752 | 753 | $thumbName = $this->thumbName( $normalisedParams ); |
| 753 | 754 | $thumbUrl = $this->getThumbUrl( $thumbName ); |
| 754 | 755 | |
| 755 | | - $thumb = $this->maybeDoTransform( $thumbName, $thumbUrl, $params ); |
| | 756 | + $thumb = $this->maybeDoTransform( $thumbName, $thumbUrl, $params, $flags ); |
| 756 | 757 | |
| 757 | 758 | // Purge. Useful in the event of Core -> Squid connection failure or squid |
| 758 | 759 | // purge collisions from elsewhere during failure. Don't keep triggering for |
| Index: trunk/extensions/SwiftMedia/SwiftMedia.body.php |
| — | — | @@ -135,7 +135,7 @@ |
| 136 | 136 | /** |
| 137 | 137 | * class-specific transform (from an original into a thumb). |
| 138 | 138 | */ |
| 139 | | - function maybeDoTransform( $thumbName, $thumbUrl, $params ) { |
| | 139 | + function maybeDoTransform( $thumbName, $thumbUrl, $params, $flags = 0 ) { |
| 140 | 140 | global $wgIgnoreImageErrors, $wgThumbnailEpoch, $wgTmpDirectory; |
| 141 | 141 | |
| 142 | 142 | // get a temporary place to put the original. |