summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-02-14 19:46:09 +0100
committerGitHub <noreply@github.com>2018-02-14 19:46:09 +0100
commit71a63cb82bacdec999258304adbfee6e70cf680e (patch)
tree360dc9d3be629148033849a6ae1bc80999d6b00a /system/libraries
parentc0b0e763425c88342efa226f22b2758169c6cb0f (diff)
parent06e5d36f566c68b51ded2c2c307094c062e17a10 (diff)
[ci skip] Merge pull request #5397 from mehdibo/patch-1
File name changing in dynamic output image_lib
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Image_lib.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 63e071e7c..f37f25f5e 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -1548,7 +1548,7 @@ class CI_Image_lib {
*/
public function image_display_gd($resource)
{
- header('Content-Disposition: filename='.$this->source_image.';');
+ header('Content-Disposition: filename='.basename(empty($this->new_image) ? $this->source_image : $this->new_image).';');
header('Content-Type: '.$this->mime_type);
header('Content-Transfer-Encoding: binary');
header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT');