From 3eb0d4f1a47b7d3041d99d1571df162657492274 Mon Sep 17 00:00:00 2001 From: Leon Klingele Date: Wed, 6 Mar 2019 13:07:41 +0100 Subject: lib/private/User,apps/user_ldap/lib/User: always pass old value to User::triggerChange --- lib/private/User/User.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/private') diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 48c913db2a9..0d12eb494ec 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -138,11 +138,12 @@ class User implements IUser { */ public function setDisplayName($displayName) { $displayName = trim($displayName); + $oldDisplayName = $this->getDisplayName(); if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) { $result = $this->backend->setDisplayName($this->uid, $displayName); if ($result) { $this->displayName = $displayName; - $this->triggerChange('displayName', $displayName); + $this->triggerChange('displayName', $displayName, $oldDisplayName); } return $result !== false; } -- cgit v1.2.3 From 9a5ca231bfdaaeaea59fd1e36bc312668fb7df39 Mon Sep 17 00:00:00 2001 From: Leon Klingele Date: Wed, 6 Mar 2019 13:10:18 +0100 Subject: lib/private/User: do not change user properties if value has not changed --- lib/private/User/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private') diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 0d12eb494ec..12af787a5a6 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -139,7 +139,7 @@ class User implements IUser { public function setDisplayName($displayName) { $displayName = trim($displayName); $oldDisplayName = $this->getDisplayName(); - if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) { + if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName) && $displayName !== $oldDisplayName) { $result = $this->backend->setDisplayName($this->uid, $displayName); if ($result) { $this->displayName = $displayName; -- cgit v1.2.3