summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-03-10 01:08:32 +0100
committerGitHub <noreply@github.com>2018-03-10 01:08:32 +0100
commit5e9fec04649b530637732ea616e36b66efac1faf (patch)
tree1be8acfec5827b65b5633ae2034a752981256e5c /system/libraries
parentb19f82cf12b4e34cde7c9235d2618dddaea4a38f (diff)
parent6f7f5f403769544e7e2dd7f6b0056920768236fb (diff)
[ci skip] Merge pull request #5434 from xims/patch-3
Update Image_lib to avoid setting file permissions when not needed
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Image_lib.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index dbe5cbbd1..a07557f61 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -835,7 +835,10 @@ class CI_Image_lib {
imagedestroy($dst_img);
imagedestroy($src_img);
- chmod($this->full_dst_path, $this->file_permissions);
+ if ($this->dynamic_output !== TRUE)
+ {
+ chmod($this->full_dst_path, $this->file_permissions);
+ }
return TRUE;
}