summaryrefslogtreecommitdiffstats
path: root/lib/private/User
diff options
context:
space:
mode:
authorLeon Klingele <leon@struktur.de>2019-03-06 13:07:41 +0100
committerMorris Jobke <hey@morrisjobke.de>2019-04-11 11:20:41 +0200
commit3eb0d4f1a47b7d3041d99d1571df162657492274 (patch)
treeffc20222224168dde0f3e39d61b80dd9d3d94dab /lib/private/User
parentccabc63a09ee78913db682ac59bfba5512ace442 (diff)
downloadnextcloud-server-3eb0d4f1a47b7d3041d99d1571df162657492274.tar.gz
nextcloud-server-3eb0d4f1a47b7d3041d99d1571df162657492274.zip
lib/private/User,apps/user_ldap/lib/User: always pass old value to User::triggerChange
Diffstat (limited to 'lib/private/User')
-rw-r--r--lib/private/User/User.php3
1 files changed, 2 insertions, 1 deletions
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;
}