http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96599
Revision: 96599
Author: ialex
Date: 2011-09-08 19:11:33 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Fix for r96516: undefined variable $flags
Modified Paths:
--------------
trunk/extensions/SwiftMedia/SwiftMedia.body.php
trunk/phase3/includes/filerepo/File.php
Modified: trunk/extensions/SwiftMedia/SwiftMedia.body.php
===================================================================
--- trunk/extensions/SwiftMedia/SwiftMedia.body.php 2011-09-08 19:06:43 UTC
(rev 96598)
+++ trunk/extensions/SwiftMedia/SwiftMedia.body.php 2011-09-08 19:11:33 UTC
(rev 96599)
@@ -135,7 +135,7 @@
/**
* class-specific transform (from an original into a thumb).
*/
- function maybeDoTransform( $thumbName, $thumbUrl, $params ) {
+ function maybeDoTransform( $thumbName, $thumbUrl, $params, $flags = 0 )
{
global $wgIgnoreImageErrors, $wgThumbnailEpoch, $wgTmpDirectory;
// get a temporary place to put the original.
Modified: trunk/phase3/includes/filerepo/File.php
===================================================================
--- trunk/phase3/includes/filerepo/File.php 2011-09-08 19:06:43 UTC (rev
96598)
+++ trunk/phase3/includes/filerepo/File.php 2011-09-08 19:11:33 UTC (rev
96599)
@@ -675,10 +675,11 @@
* @param $thumbUrl string: the URL of the thumbnail file.
* @param $params Array: an associative array of handler-specific
parameters.
* Typical keys are width, height and page.
+ * @param $flags Integer: a bitfield, may contain self::RENDER_NOW to
force rendering
*
* @return MediaTransformOutput | false
*/
- protected function maybeDoTransform( $thumbName, $thumbUrl, $params ) {
+ protected function maybeDoTransform( $thumbName, $thumbUrl, $params,
$flags = 0 ) {
global $wgIgnoreImageErrors, $wgThumbnailEpoch;
$thumbPath = $this->getThumbPath( $thumbName );
@@ -751,7 +752,7 @@
$thumbName = $this->thumbName( $normalisedParams );
$thumbUrl = $this->getThumbUrl( $thumbName );
- $thumb = $this->maybeDoTransform( $thumbName,
$thumbUrl, $params );
+ $thumb = $this->maybeDoTransform( $thumbName,
$thumbUrl, $params, $flags );
// Purge. Useful in the event of Core -> Squid
connection failure or squid
// purge collisions from elsewhere during failure.
Don't keep triggering for
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
