diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-01-04 22:56:58 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-01-04 22:57:42 +0100 |
commit | 48a8f2a793d2154c7f9d963fda679e0c380cb273 (patch) | |
tree | a7cfa30bc16619bfbe8d284b1f6ed2a55af2b62f /lib/image.php | |
parent | b6d66c4727e50ab9e9ade0e804e3fda98a120dd3 (diff) | |
download | nextcloud-server-48a8f2a793d2154c7f9d963fda679e0c380cb273.tar.gz nextcloud-server-48a8f2a793d2154c7f9d963fda679e0c380cb273.zip |
Content type header was sent when saving image to disk.
Diffstat (limited to 'lib/image.php')
-rw-r--r-- | lib/image.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/image.php b/lib/image.php index e09486be081..32568a25406 100644 --- a/lib/image.php +++ b/lib/image.php @@ -125,7 +125,7 @@ class OC_Image { */ public function save($filepath=null) { - if($filepath === null && $this->filepath === null) { + if($filepath === null && self::$filepath === null) { OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR); return false; } elseif($filepath === null && $this->filepath !== null) { @@ -138,8 +138,8 @@ class OC_Image { * @brief Outputs/saves the image. */ private function _output($filepath=null, $really=false) { - header('Content-Type: '.self::mimeType()); if($really === false) { + header('Content-Type: '.self::mimeType()); $filepath = null; // Just being cautious ;-) } else { if(!is_writable(dirname($filepath))) { |