diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-06-02 13:14:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 13:14:33 +0200 |
| commit | 2e2d406bf5bf462b2c47320c08452de8016c1fb7 (patch) | |
| tree | a6260836fd17165cfb11b891d76b78b6d7564aeb /lib | |
| parent | 45305c762dd9902d90fbfcdd4bf1ec6346fb769f (diff) | |
| parent | 999455c1aa8fc4a02a2fd778cd25fe3e4a1843ac (diff) | |
| download | nextcloud-server-2e2d406bf5bf462b2c47320c08452de8016c1fb7.tar.gz nextcloud-server-2e2d406bf5bf462b2c47320c08452de8016c1fb7.zip | |
Merge pull request #5213 from nextcloud/fix-change-hook
Trigger changeUser hook only on real changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/User/User.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 5e5d3f0d772..645f7b8e59c 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -165,7 +165,9 @@ class User implements IUser { } else { $this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress); } - $this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress); + if($oldMailAddress !== $mailAddress) { + $this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress); + } } /** @@ -388,12 +390,15 @@ class User implements IUser { * @since 9.0.0 */ public function setQuota($quota) { + $oldQuota = $this->config->getUserValue($this->uid, 'files', 'quota', ''); if($quota !== 'none' and $quota !== 'default') { $quota = OC_Helper::computerFileSize($quota); $quota = OC_Helper::humanFileSize($quota); } $this->config->setUserValue($this->uid, 'files', 'quota', $quota); - $this->triggerChange('quota', $quota); + if($quota !== $oldQuota) { + $this->triggerChange('quota', $quota); + } } /** |