Merged changes up to 2.3.16 into unstable

[fa-stable.git] / includes / main.inc

diff --git a/includes/main.inc b/includes/main.inc
index 98143cf9843626965a97036f555bf0008be2baff..1101584eca779028dd8b6f1bec7547fddad91b7b 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -261,9 +261,9 @@ function check_write($path)
 {
        if ($path == ''//|| $path == '.' || $path == '..'
        ) return 0;
-       
+
        return is_writable($path) ? (is_dir($path) ? 1 : -1) 
-               : (is_file($path) ? 0 : ($path == '.' ? 0 : check_write(dirname($path))));
+               : (is_file($path) ? 0 : ($path == '.' || $path == '..' ? 0 : check_write(dirname($path))));
 }
 
 /*