mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass old value to user triggerChange hook 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2019-04-11 09:49:21 +02:00
parent aac22ba40f
commit 36618b111f
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/User/User.php
View File

@ -436,7 +436,7 @@ class User {
if (!empty($oldName) && $user instanceof \OC\User\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 // 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. // potentially cause a UniqueConstraintViolationException, depending on some factors.
$user->triggerChange('displayName', $displayName); $user->triggerChange('displayName', $displayName, $oldName);
} }
} }
return $displayName; return $displayName;

8
lib/private/User/User.php
View File

@ -145,9 +145,8 @@ class User implements IUser {
$this->triggerChange('displayName', $displayName); $this->triggerChange('displayName', $displayName);
} }
return $result !== false; return $result !== false;
} else {
return false;
} }
return false;
} }
/** /**
@ -365,7 +364,8 @@ class User implements IUser {
$oldStatus = $this->isEnabled(); $oldStatus = $this->isEnabled();
$this->enabled = $enabled; $this->enabled = $enabled;
if ($oldStatus !== $this->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'); $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); $this->config->setUserValue($this->uid, 'files', 'quota', $quota);
if($quota !== $oldQuota) { if($quota !== $oldQuota) {
$this->triggerChange('quota', $quota); $this->triggerChange('quota', $quota, $oldQuota);
} }
} }