dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[JobQueue] Pushed stats down to job queue subclasses."
[lhc/web/wiklou.git]
/
includes
/
media
/
ImageHandler.php
diff --git
a/includes/media/ImageHandler.php
b/includes/media/ImageHandler.php
index
69f51be
..
6175907
100644
(file)
--- a/
includes/media/ImageHandler.php
+++ b/
includes/media/ImageHandler.php
@@
-189,11
+189,9
@@
abstract class ImageHandler extends MediaHandler {
return false;
}
$url = $script . '&' . wfArrayToCGI( $this->getScriptParams( $params ) );
return false;
}
$url = $script . '&' . wfArrayToCGI( $this->getScriptParams( $params ) );
- $page = isset( $params['page'] ) ? $params['page'] : false;
if( $image->mustRender() || $params['width'] < $image->getWidth() ) {
if( $image->mustRender() || $params['width'] < $image->getWidth() ) {
- return new ThumbnailImage( $image,
- $url, $params['width'], $params['height'], false, $page );
+ return new ThumbnailImage( $image, $url, false, $params );
}
}
}
}
@@
-204,10
+202,6
@@
abstract class ImageHandler extends MediaHandler {
return $gis;
}
return $gis;
}
- function isAnimatedImage( $image ) {
- return false;
- }
-
/**
* @param $file File
* @return string
/**
* @param $file File
* @return string