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 "FauxRequest: Remove influence from $wgRequest on getFullRequestURL()"
[lhc/web/wiklou.git]
/
includes
/
media
/
GIFHandler.php
diff --git
a/includes/media/GIFHandler.php
b/includes/media/GIFHandler.php
index
556e83c
..
9ef37fb
100644
(file)
--- a/
includes/media/GIFHandler.php
+++ b/
includes/media/GIFHandler.php
@@
-86,8
+86,11
@@
class GIFHandler extends BitmapHandler {
$ser = $image->getMetadata();
if ( $ser ) {
$metadata = unserialize( $ser );
$ser = $image->getMetadata();
if ( $ser ) {
$metadata = unserialize( $ser );
-
- return $image->getWidth() * $image->getHeight() * $metadata['frameCount'];
+ if ( isset( $metadata['frameCount'] ) && $metadata['frameCount'] > 0 ) {
+ return $image->getWidth() * $image->getHeight() * $metadata['frameCount'];
+ } else {
+ return $image->getWidth() * $image->getHeight();
+ }
} else {
return $image->getWidth() * $image->getHeight();
}
} else {
return $image->getWidth() * $image->getHeight();
}
@@
-101,7
+104,7
@@
class GIFHandler extends BitmapHandler {
$ser = $image->getMetadata();
if ( $ser ) {
$metadata = unserialize( $ser );
$ser = $image->getMetadata();
if ( $ser ) {
$metadata = unserialize( $ser );
- if ( $metadata['frameCount'] > 1 ) {
+ if (
isset( $metadata['frameCount'] ) &&
$metadata['frameCount'] > 1 ) {
return true;
}
}
return true;
}
}