diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
| commit | 6081bfa2bcbe121e373486273ecce58a49e6fa97 (patch) | |
| tree | f2504800c66919a53eff9323724b493079569495 /settings/personal.php | |
| parent | c2b4e534534e083147bbad9b564179832cfa2912 (diff) | |
| parent | 44287d680bd0e8799724a7595db43c0fafcaff40 (diff) | |
| download | nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.tar.gz nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.zip | |
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
Diffstat (limited to 'settings/personal.php')
| -rw-r--r-- | settings/personal.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/settings/personal.php b/settings/personal.php index ce9065247df..f28ab2ae755 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -18,12 +18,8 @@ OC_App::setActiveNavigationEntry( 'personal' ); // calculate the disc space $rootInfo=OC_FileCache::get(''); $sharedInfo=OC_FileCache::get('/Shared'); -if (!isset($sharedInfo['size'])) { - $sharedSize = 0; -} else { - $sharedSize = $sharedInfo['size']; -} -$used=$rootInfo['size']-$sharedSize; +$used=$rootInfo['size']; +if($used<0) $used=0; $free=OC_Filesystem::free_space(); $total=$free+$used; if($total==0) $total=1; // prevent division by zero |