diff options
| author | Amir Sarabadani <Ladsgroup@gmail.com> | 2021-06-23 23:44:54 +0200 |
|---|---|---|
| committer | Amir Sarabadani <Ladsgroup@gmail.com> | 2021-06-23 23:59:06 +0200 |
| commit | cafb14dffbc934455d7d6a93e52ae183fb7f9d35 (patch) | |
| tree | da60cbda89b51ed7269090c3a5d8e3614f24d4bd /includes/media/PNGHandler.php | |
| parent | 0ecbc373cd9e037c11cd28965e79e9b481814711 (diff) | |
| download | mediawikicore-cafb14dffbc934455d7d6a93e52ae183fb7f9d35.tar.gz mediawikicore-cafb14dffbc934455d7d6a93e52ae183fb7f9d35.zip | |
Check for _error in getting metadata array in PNGHandler
Before I039785d5b6, it would just suppress errors and return empty value
in which shorten out. Now, it returns [ '_error' => some value ] which
is not empty value but doesn't have anything this method wants either.
Bug: T285431
Change-Id: Ia2bc0982ffaeda0575af1481f9b84faad7d784ad
Diffstat (limited to 'includes/media/PNGHandler.php')
| -rw-r--r-- | includes/media/PNGHandler.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/media/PNGHandler.php b/includes/media/PNGHandler.php index 2723cfc09ee9..b6045d05917a 100644 --- a/includes/media/PNGHandler.php +++ b/includes/media/PNGHandler.php @@ -150,7 +150,11 @@ class PNGHandler extends BitmapHandler { $metadata = $image->getMetadataArray(); - if ( !$metadata || $metadata['frameCount'] <= 0 ) { + if ( + !$metadata || + ( isset( $metadata['_error'] ) && $metadata['_error'] ) || + $metadata['frameCount'] <= 0 + ) { return $original; } |