diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/media/BMP.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/media/BMP.php')
| -rw-r--r-- | includes/media/BMP.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/media/BMP.php b/includes/media/BMP.php index d8b0ba64..52f9518f 100644 --- a/includes/media/BMP.php +++ b/includes/media/BMP.php @@ -71,7 +71,7 @@ class BmpHandler extends BitmapHandler { try { $w = wfUnpack( 'V', $w, 4 ); $h = wfUnpack( 'V', $h, 4 ); - } catch ( MWException $e ) { + } catch ( Exception $e ) { return false; } |