diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-04-11 09:49:21 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2019-04-11 10:03:38 +0200 |
| commit | 36618b111fde55ba5c8ddedc294e58927257d107 (patch) | |
| tree | dce4f7b9ba7dfdf013e18045ca25253d82ae3975 | |
| parent | aac22ba40fa9bed24f6e78386de4ae846660d340 (diff) | |
| download | nextcloud-server-36618b111fde55ba5c8ddedc294e58927257d107.tar.gz nextcloud-server-36618b111fde55ba5c8ddedc294e58927257d107.zip | |
Pass old value to user triggerChange hook
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | apps/user_ldap/lib/User/User.php | 2 | ||||
| -rw-r--r-- | lib/private/User/User.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index d68d8b35d14..5c89950e080 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -436,7 +436,7 @@ class User { if (!empty($oldName) && $user instanceof \OC\User\User) { // if it was empty, it would be a new record, not a change emitting the trigger could // potentially cause a UniqueConstraintViolationException, depending on some factors. - $user->triggerChange('displayName', $displayName); + $user->triggerChange('displayName', $displayName, $oldName); } } return $displayName; diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 17fa022b1b7..a47ef8dc543 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -145,9 +145,8 @@ class User implements IUser { $this->triggerChange('displayName', $displayName); } return $result !== false; - } else { - return false; } + return false; } /** @@ -365,7 +364,8 @@ class User implements IUser { $oldStatus = $this->isEnabled(); $this->enabled = $enabled; if ($oldStatus !== $this->enabled) { - $this->triggerChange('enabled', $enabled); + // TODO: First change the value, then trigger the event as done for all other properties. + $this->triggerChange('enabled', $enabled, $oldStatus); $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false'); } } @@ -409,7 +409,7 @@ class User implements IUser { } $this->config->setUserValue($this->uid, 'files', 'quota', $quota); if($quota !== $oldQuota) { - $this->triggerChange('quota', $quota); + $this->triggerChange('quota', $quota, $oldQuota); } } |