diff options
| author | Pellaeon Lin <nfsmwlin@gmail.com> | 2014-01-30 22:50:20 +0800 |
|---|---|---|
| committer | Pellaeon Lin <nfsmwlin@gmail.com> | 2014-01-30 22:50:20 +0800 |
| commit | 099b71c712c38de7dac7e386252da02bb0cadf12 (patch) | |
| tree | 84bcf83efdc4cc759a5ff184fa5148195abaab51 /apps/files/index.php | |
| parent | 929c930b0afd682bb98eb389d7ebad91bb34d643 (diff) | |
| parent | 299a8285bd2601ccbac988b2e3e9b067d47921a2 (diff) | |
| download | nextcloud-server-099b71c712c38de7dac7e386252da02bb0cadf12.tar.gz nextcloud-server-099b71c712c38de7dac7e386252da02bb0cadf12.zip | |
Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
Diffstat (limited to 'apps/files/index.php')
| -rw-r--r-- | apps/files/index.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 61b32bc6fe3..dd63f29bc28 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -63,7 +63,6 @@ $files = array(); $user = OC_User::getUser(); if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we need to upgrade the cache $needUpgrade = true; - $freeSpace = 0; } else { if ($isIE8){ // after the redirect above, the URL will have a format @@ -77,7 +76,6 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne else{ $files = \OCA\Files\Helper::getFiles($dir); } - $freeSpace = \OC\Files\Filesystem::free_space($dir); $needUpgrade = false; } |