diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-23 23:10:37 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-23 23:10:37 +0200 |
| commit | 6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d (patch) | |
| tree | b564539f21866e6049d69da6d011647ff46540f7 /lib/helper.php | |
| parent | 1dab0767502013b5e86e8e24e3b12a2a8939f7a8 (diff) | |
| parent | 02b2b5a808b135007d8d54b837e70c38f02729fd (diff) | |
| download | nextcloud-server-6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d.tar.gz nextcloud-server-6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d.zip | |
Merge branch 'master' into oc_preview
Diffstat (limited to 'lib/helper.php')
| -rw-r--r-- | lib/helper.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/helper.php b/lib/helper.php index ea9afb7f8f2..4c3415f4afa 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -55,8 +55,8 @@ class OC_Helper { * * Returns a url to the given app and file. */ - public static function linkTo($app, $file, $args = array()) { - if ($app != '') { + public static function linkTo( $app, $file, $args = array() ) { + if( $app != '' ) { $app_path = OC_App::getAppPath($app); // Check if the app is in the app folder if ($app_path && file_exists($app_path . '/' . $file)) { @@ -832,14 +832,14 @@ class OC_Helper { $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $freeSpace = \OC\Files\Filesystem::free_space($dir); if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) { - $maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED; + $maxUploadFilesize = \OC\Files\SPACE_UNLIMITED; } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) { $maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts } else { $maxUploadFilesize = min($upload_max_filesize, $post_max_size); } - if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN) { + if ($freeSpace !== \OC\Files\SPACE_UNKNOWN) { $freeSpace = max($freeSpace, 0); return min($maxUploadFilesize, $freeSpace); |