diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2015-09-29 16:19:45 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2015-10-27 18:07:40 +0100 |
| commit | e1d61284f87f2bb5aaf1523ce4f78e439d737165 (patch) | |
| tree | dc074fada9fda21f6f2bdea68f1e0ebcacea331a /apps/user_ldap/lib | |
| parent | c30919303990c51b78157d86b95c0f97e004233d (diff) | |
| download | nextcloud-server-e1d61284f87f2bb5aaf1523ce4f78e439d737165.tar.gz nextcloud-server-e1d61284f87f2bb5aaf1523ce4f78e439d737165.zip | |
fix update quota with known value
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/user/user.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index c77f7254c94..0dc3c8c0c26 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -417,9 +417,9 @@ class User { } //can be null $quotaDefault = $this->connection->ldapQuotaDefault; - $quota = !is_null($valueFromLDAP) - ? $valueFromLDAP - : $quotaDefault !== '' ? $quotaDefault : null; + $quota = $quotaDefault !== '' ? $quotaDefault : null; + $quota = !is_null($valueFromLDAP) ? $valueFromLDAP : $quota; + if(is_null($valueFromLDAP)) { $quotaAttribute = $this->connection->ldapQuotaAttribute; if(!empty($quotaAttribute)) { |