Merge pull request #6910 from nextcloud/backport-6677-s12
[stable12] don't reset quota
This commit is contained in:
commit
ad66244bdf
|
@ -436,8 +436,8 @@ class Connection extends LDAPUtility {
|
|||
|| ($agent !== '' && $pwd === '')
|
||||
) {
|
||||
\OCP\Util::writeLog('user_ldap',
|
||||
$errorStr.'either no password is given for the'.
|
||||
'user agent or a password is given, but not an'.
|
||||
$errorStr.'either no password is given for the '.
|
||||
'user agent or a password is given, but not an '.
|
||||
'LDAP agent.',
|
||||
\OCP\Util::WARN);
|
||||
$configurationOK = false;
|
||||
|
|
|
@ -529,7 +529,6 @@ class User {
|
|||
$targetUser->setQuota($quota);
|
||||
} else {
|
||||
$this->log->log('not suitable default quota found for user ' . $this->uid . ': [' . $defaultQuota . ']', \OCP\Util::WARN);
|
||||
$targetUser->setQuota('default');
|
||||
}
|
||||
} else {
|
||||
$this->log->log('trying to set a quota for user ' . $this->uid . ' but the user is missing', \OCP\Util::ERROR);
|
||||
|
|
|
@ -453,9 +453,8 @@ class UserTest extends \Test\TestCase {
|
|||
->will($this->returnValue(false));
|
||||
|
||||
$user = $this->createMock('\OCP\IUser');
|
||||
$user->expects($this->once())
|
||||
->method('setQuota')
|
||||
->with('default');
|
||||
$user->expects($this->never())
|
||||
->method('setQuota');
|
||||
|
||||
$userMgr->expects($this->once())
|
||||
->method('get')
|
||||
|
@ -495,9 +494,8 @@ class UserTest extends \Test\TestCase {
|
|||
->method('__get');
|
||||
|
||||
$user = $this->createMock('\OCP\IUser');
|
||||
$user->expects($this->once())
|
||||
->method('setQuota')
|
||||
->with('default');
|
||||
$user->expects($this->never())
|
||||
->method('setQuota');
|
||||
|
||||
$userMgr->expects($this->once())
|
||||
->method('get')
|
||||
|
@ -633,9 +631,8 @@ class UserTest extends \Test\TestCase {
|
|||
->will($this->returnValue(false));
|
||||
|
||||
$user = $this->createMock('\OCP\IUser');
|
||||
$user->expects($this->once())
|
||||
->method('setQuota')
|
||||
->with('default');
|
||||
$user->expects($this->never())
|
||||
->method('setQuota');
|
||||
|
||||
$userMgr->expects($this->once())
|
||||
->method('get')
|
||||
|
@ -681,9 +678,8 @@ class UserTest extends \Test\TestCase {
|
|||
->will($this->returnValue(array('23 flush')));
|
||||
|
||||
$user = $this->createMock('\OCP\IUser');
|
||||
$user->expects($this->once())
|
||||
->method('setQuota')
|
||||
->with('default');
|
||||
$user->expects($this->never())
|
||||
->method('setQuota');
|
||||
|
||||
$userMgr->expects($this->once())
|
||||
->method('get')
|
||||
|
@ -726,9 +722,8 @@ class UserTest extends \Test\TestCase {
|
|||
->method('readAttribute');
|
||||
|
||||
$user = $this->createMock('\OCP\IUser');
|
||||
$user->expects($this->once())
|
||||
->method('setQuota')
|
||||
->with('default');
|
||||
$user->expects($this->never())
|
||||
->method('setQuota');
|
||||
|
||||
$userMgr->expects($this->once())
|
||||
->method('get')
|
||||
|
|
Loading…
Reference in New Issue