diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-02-02 14:43:06 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-02-02 14:43:06 +0000 |
| commit | a051c2744a397f5ccbb688e0edab307451dc522d (patch) | |
| tree | d9744944e50f2c23df22bd6856779bd228e129c4 /lib/exe/fetch.php | |
| parent | 3641199a253e8f92f378f03926af80724ef04146 (diff) | |
| parent | a8895ef5de970d5e6b1e273c3fe111b606611244 (diff) | |
| download | rpg-a051c2744a397f5ccbb688e0edab307451dc522d.tar.gz rpg-a051c2744a397f5ccbb688e0edab307451dc522d.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'lib/exe/fetch.php')
| -rw-r--r-- | lib/exe/fetch.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 5967494bf..f33b3f2f8 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -78,8 +78,8 @@ if (defined('SIMPLE_TEST')) { unset($evt); //handle image resizing/cropping - if((substr($MIME, 0, 5) == 'image') && $WIDTH) { - if($HEIGHT) { + if((substr($MIME, 0, 5) == 'image') && ($WIDTH || $HEIGHT)) { + if($HEIGHT && $WDITH) { $data['file'] = $FILE = media_crop_image($data['file'], $EXT, $WIDTH, $HEIGHT); } else { $data['file'] = $FILE = media_resize_image($data['file'], $EXT, $WIDTH, $HEIGHT); |