From d80b477ab55c459cc80cf091c80f81082b7d78f9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jan 2012 23:31:32 +0100
Subject: [PATCH] Wrong permission checking on file save.
---
lib/image.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/image.php b/lib/image.php
index 32568a2540..f120328b0e 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -143,10 +143,10 @@ class OC_Image {
$filepath = null; // Just being cautious ;-)
} else {
if(!is_writable(dirname($filepath))) {
- OC_Log::write('core','OC_Image::save. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
+ OC_Log::write('core','OC_Image::_output. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
return false;
- } elseif(is_writable(dirname($filepath)) && !is_writable($filepath)) {
- OC_Log::write('core','OC_Image::save. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+ } elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) {
+ OC_Log::write('core','OC_Image::_output. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
return false;
}
}
--
GitLab