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 "Allow postEdit hook to be triggered asynchronously"
[lhc/web/wiklou.git]
/
includes
/
media
/
ImageHandler.php
diff --git
a/includes/media/ImageHandler.php
b/includes/media/ImageHandler.php
index
419afee
..
8e46f2f
100644
(file)
--- a/
includes/media/ImageHandler.php
+++ b/
includes/media/ImageHandler.php
@@
-58,7
+58,7
@@
abstract class ImageHandler extends MediaHandler {
} elseif ( isset( $params['width'] ) ) {
$width = $params['width'];
} else {
} elseif ( isset( $params['width'] ) ) {
$width = $params['width'];
} else {
- throw new MWException( 'No width specified to '
.
__METHOD__ );
+ throw new MWException( 'No width specified to '
.
__METHOD__ );
}
# Removed for ProofreadPage
#$width = intval( $width );
}
# Removed for ProofreadPage
#$width = intval( $width );
@@
-92,7
+92,7
@@
abstract class ImageHandler extends MediaHandler {
if ( !isset( $params['page'] ) ) {
$params['page'] = 1;
if ( !isset( $params['page'] ) ) {
$params['page'] = 1;
- } else
{
+ } else {
if ( $params['page'] > $image->pageCount() ) {
$params['page'] = $image->pageCount();
}
if ( $params['page'] > $image->pageCount() ) {
$params['page'] = $image->pageCount();
}
@@
-160,7
+160,7
@@
abstract class ImageHandler extends MediaHandler {
$width = intval( $width );
# Sanity check $width
$width = intval( $width );
# Sanity check $width
- if
( $width <= 0
) {
+ if
( $width <= 0
) {
wfDebug( __METHOD__ . ": Invalid destination width: $width\n" );
return false;
}
wfDebug( __METHOD__ . ": Invalid destination width: $width\n" );
return false;
}
@@
-187,9
+187,9
@@
abstract class ImageHandler extends MediaHandler {
if ( !$this->normaliseParams( $image, $params ) ) {
return false;
}
if ( !$this->normaliseParams( $image, $params ) ) {
return false;
}
- $url =
$script . '&' . wfArrayToCgi(
$this->getScriptParams( $params ) );
+ $url =
wfAppendQuery( $script,
$this->getScriptParams( $params ) );
- if( $image->mustRender() || $params['width'] < $image->getWidth() ) {
+ if
( $image->mustRender() || $params['width'] < $image->getWidth() ) {
return new ThumbnailImage( $image, $url, false, $params );
}
}
return new ThumbnailImage( $image, $url, false, $params );
}
}