diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-22 20:40:04 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-22 20:40:04 +0100 |
| commit | 8e8c4a8edc630ff833361c067da5e0d30e94c6d1 (patch) | |
| tree | 295e854c72f90874149f578f8f55112383338bf5 /lib | |
| parent | 8f8d486f35c8f1d290e3db2ba7ae42dcb380d1dd (diff) | |
| parent | 82b54938e32a980d3d268a63fdf56598f12e2ff4 (diff) | |
| download | nextcloud-server-8e8c4a8edc630ff833361c067da5e0d30e94c6d1.tar.gz nextcloud-server-8e8c4a8edc630ff833361c067da5e0d30e94c6d1.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files.php b/lib/files.php index 662f0b59724..57ebb9005ad 100644 --- a/lib/files.php +++ b/lib/files.php @@ -224,7 +224,7 @@ class OC_Files { * @param files $files */ static function validateZipDownload($dir, $files) { - if(!OC_Preferences::getValue('', 'files', 'allowZipDownload', 1)) { + if(!OC_Config::getValue('allowZipDownload', true)) { $l = new OC_L10N('files'); header("HTTP/1.0 409 Conflict"); $tmpl = new OC_Template( '', 'error', 'user' ); @@ -239,7 +239,7 @@ class OC_Files { exit; } - $zipLimit = OC_Preferences::getValue('', 'files', 'maxZipInputSize', OC_Helper::computerFileSize('800 MB')); + $zipLimit = OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB')); if($zipLimit > 0) { $totalsize = 0; if(is_array($files)){ |