lib/private/User: do not change user properties if value has not changed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
36618b111f
commit
f420647add
|
@ -158,12 +158,12 @@ class User implements IUser {
|
||||||
*/
|
*/
|
||||||
public function setEMailAddress($mailAddress) {
|
public function setEMailAddress($mailAddress) {
|
||||||
$oldMailAddress = $this->getEMailAddress();
|
$oldMailAddress = $this->getEMailAddress();
|
||||||
if($mailAddress === '') {
|
|
||||||
$this->config->deleteUserValue($this->uid, 'settings', 'email');
|
|
||||||
} else {
|
|
||||||
$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
|
|
||||||
}
|
|
||||||
if($oldMailAddress !== $mailAddress) {
|
if($oldMailAddress !== $mailAddress) {
|
||||||
|
if($mailAddress === '') {
|
||||||
|
$this->config->deleteUserValue($this->uid, 'settings', 'email');
|
||||||
|
} else {
|
||||||
|
$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
|
||||||
|
}
|
||||||
$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
|
$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -407,8 +407,8 @@ class User implements IUser {
|
||||||
$quota = OC_Helper::computerFileSize($quota);
|
$quota = OC_Helper::computerFileSize($quota);
|
||||||
$quota = OC_Helper::humanFileSize($quota);
|
$quota = OC_Helper::humanFileSize($quota);
|
||||||
}
|
}
|
||||||
$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
|
|
||||||
if($quota !== $oldQuota) {
|
if($quota !== $oldQuota) {
|
||||||
|
$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
|
||||||
$this->triggerChange('quota', $quota, $oldQuota);
|
$this->triggerChange('quota', $quota, $oldQuota);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -676,14 +676,8 @@ class UserTest extends TestCase {
|
||||||
$config->expects($this->any())
|
$config->expects($this->any())
|
||||||
->method('getUserValue')
|
->method('getUserValue')
|
||||||
->willReturn('foo@bar.com');
|
->willReturn('foo@bar.com');
|
||||||
$config->expects($this->once())
|
$config->expects($this->never())
|
||||||
->method('setUserValue')
|
->method('setUserValue');
|
||||||
->with(
|
|
||||||
'foo',
|
|
||||||
'settings',
|
|
||||||
'email',
|
|
||||||
'foo@bar.com'
|
|
||||||
);
|
|
||||||
|
|
||||||
$user = new User('foo', $backend, $this->dispatcher, $emitter, $config);
|
$user = new User('foo', $backend, $this->dispatcher, $emitter, $config);
|
||||||
$user->setEMailAddress('foo@bar.com');
|
$user->setEMailAddress('foo@bar.com');
|
||||||
|
@ -741,14 +735,8 @@ class UserTest extends TestCase {
|
||||||
$config->expects($this->any())
|
$config->expects($this->any())
|
||||||
->method('getUserValue')
|
->method('getUserValue')
|
||||||
->willReturn('23 TB');
|
->willReturn('23 TB');
|
||||||
$config->expects($this->once())
|
$config->expects($this->never())
|
||||||
->method('setUserValue')
|
->method('setUserValue');
|
||||||
->with(
|
|
||||||
'foo',
|
|
||||||
'files',
|
|
||||||
'quota',
|
|
||||||
'23 TB'
|
|
||||||
);
|
|
||||||
|
|
||||||
$user = new User('foo', $backend, $this->dispatcher, $emitter, $config);
|
$user = new User('foo', $backend, $this->dispatcher, $emitter, $config);
|
||||||
$user->setQuota('23 TB');
|
$user->setQuota('23 TB');
|
||||||
|
|
Loading…
Reference in New Issue