write a warning to the log file if .htaccess is not writable instead of failing silently

2012-06-05 11:50:21 +07:00 · 2012-06-05 11:50:21 +07:00 · 061abb88b5
parent d71c4db10a
commit 061abb88b5
1 changed files with 6 additions and 4 deletions
--- a/lib/files.php
+++ b/lib/files.php
@ -373,10 +373,12 @@ class OC_Files {
 			}
 		}

-		//supress errors in case we don't have permissions for it
-		if(@file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess)) {
-			return OC_Helper::computerFileSize($size);
-		}
+		//check for write permissions
+		if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
+			file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
+			return OC_Helper::computerFileSize($size);	
+		} else { OC_Log::write('files','Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions',OC_Log::WARN); }
+		
 		return false;
 	}