Merge pull request #29673 from owncloud/stable10-f2cd85f4a3a6e68db3ef…

…581311cdf9b17d06c0b3 [stable10] do not reset quota if it was not provided
owncloud · Dec 5, 2017 · e608905 · e608905
2 parents 0b0dd30 + 89b27c1
commit e608905
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/private/User/SyncService.php b/lib/private/User/SyncService.php
@@ -148,7 +148,10 @@ public function setupAccount(Account $a, $uid) {
 			}
 		}
 		if ($this->backend instanceof IProvidesQuotaBackend) {
-			$a->setQuota($this->backend->getQuota($uid));
+			$quota = $this->backend->getQuota($uid);
+			if ($quota !== null) {
+				$a->setQuota($quota);
+			}
 		} else {
 			list($hasKey, $value) = $this->readUserConfig($uid, 'files', 'quota');
 			if ($hasKey) {