diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 18:39:11 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 18:39:11 +0000 |
| commit | 4e60057c8ccbee18b94a64208311f9bbb338eec6 (patch) | |
| tree | 08d79159aa78693c27f54ecebc3105034dfc5933 /lib/exe/fetch.php | |
| parent | 57a6f99d09d3662a8a2ad72e312aa6f53bcc2d01 (diff) | |
| parent | 069942acdaa5ba825bc3f92c7093b5071789f1ca (diff) | |
| download | rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.gz rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.bz2 | |
Merge branch 'master' into tablethead
Diffstat (limited to 'lib/exe/fetch.php')
| -rw-r--r-- | lib/exe/fetch.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 5967494bf..933367e35 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 && $WIDTH) { $data['file'] = $FILE = media_crop_image($data['file'], $EXT, $WIDTH, $HEIGHT); } else { $data['file'] = $FILE = media_resize_image($data['file'], $EXT, $WIDTH, $HEIGHT); @@ -89,7 +89,7 @@ if (defined('SIMPLE_TEST')) { // finally send the file to the client $evt = new Doku_Event('MEDIA_SENDFILE', $data); if($evt->advise_before()) { - sendFile($data['file'], $data['mime'], $data['download'], $data['cache'], $data['ispublic']); + sendFile($data['file'], $data['mime'], $data['download'], $data['cache'], $data['ispublic'], $data['orig']); } // Do something after the download finished. $evt->advise_after(); // will not be emitted on 304 or x-sendfile |