diff options
| author | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
| commit | d90a79c0ee1837353622e4b2abb0753ca09dffd2 (patch) | |
| tree | 554da8dc13606efc2bc1ea7fe3697a5ff87d02e5 /lib/exe/fetch.php | |
| parent | f2643d9ff318af1d2fbb6249e929212381959247 (diff) | |
| parent | a83975113c7725a13144b3e65bfb58c8447d37d7 (diff) | |
| download | rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.gz rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.bz2 | |
Merge remote-tracking branch 'origin/diff_navigation' into revisions
Conflicts:
inc/parser/xhtml.php
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..5f82ad0e0 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); @@ -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 |