diff options
| author | Côme BERNIGAUD <come.bernigaud@laposte.net> | 2011-09-01 17:21:27 +0400 |
|---|---|---|
| committer | Côme BERNIGAUD <come.bernigaud@laposte.net> | 2011-09-01 17:21:27 +0400 |
| commit | 40d9439d4efcc3a3402f996e3196487a9bbb29b4 (patch) | |
| tree | 174305f1183632a7dceccae7945a0644c8ab3348 /lib | |
| parent | b92603b3fdaef09a65088844d9dac9b06ef0a890 (diff) | |
| parent | 7fa1f8161c6884148bcc5203071223b838174d2b (diff) | |
Merge branch 'master' of git.kde.org:owncloud
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files.php | 2 | ||||
| -rw-r--r-- | lib/setup.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/files.php b/lib/files.php index dd74b086705..f1789d9c7ac 100644 --- a/lib/files.php +++ b/lib/files.php @@ -143,7 +143,7 @@ class OC_Files { header("HTTP/1.0 403 Forbidden"); die('403 Forbidden'); } - ob_end_clean(); + @ob_end_clean(); if($zip){ readfile($filename); unlink($filename); diff --git a/lib/setup.php b/lib/setup.php index afe56126277..9bb6e2df513 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -284,8 +284,10 @@ class OC_Setup { $content.= "Options -Indexes\n"; @file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it - $content = "deny from all"; + $content = "deny from all\n"; + $content.= "IndexIgnore *"; file_put_contents(OC_Config::getValue('datadirectory', $SERVERROOT.'/data').'/.htaccess', $content); + file_put_contents(OC_Config::getValue('datadirectory', $SERVERROOT.'/data').'/index.html', ''); } } |