diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
commit | f19276f7bc5fa74dff749112fffd350dad662148 (patch) | |
tree | cf0ff38b4f42f4a0272b402a07f3fd91c7cd4c69 /lib/private/util.php | |
parent | fbea02bebb561f7a76a876065066c9face6e484e (diff) | |
parent | fe24aafe7d55044e8e03a6ca2fc116174966951e (diff) | |
download | nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.tar.gz nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.zip |
Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
config/config.sample.php
Diffstat (limited to 'lib/private/util.php')
-rwxr-xr-x | lib/private/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index b39304c485c..920161949ae 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -63,7 +63,7 @@ class OC_Util { $user = $storage->getUser()->getUID(); $quota = OC_Util::getUserQuota($user); if ($quota !== \OC\Files\SPACE_UNLIMITED) { - return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota)); + return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files')); } } |