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

Merge pull request #1734 from nextcloud/setvalue_opt 

AllConfig setUserValue opt
This commit is contained in:
Lukas Reschke 2016-10-18 17:16:25 +02:00 committed by GitHub
parent 0923d2665f 6c5f7d586e
commit c55a737b26
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/encryption/tests/MigrationTest.php
View File

@ -343,6 +343,10 @@ class MigrationTest extends \Test\TestCase {
unset($cache['files_encryption']);
$this->invokePrivate(\OC::$server->getAppConfig(), 'cache', [$cache]);
$cache = $this->invokePrivate($config, 'userCache');
unset($cache[self::TEST_ENCRYPTION_MIGRATION_USER1]);
$this->invokePrivate(\OC::$server->getAppConfig(), 'userCache', [$cache]);
// delete default values set by the encryption app during initialization
/** @var \OCP\IDBConnection $connection */

19
lib/private/AllConfig.php
View File

@ -215,6 +215,25 @@ class AllConfig implements \OCP\IConfig {
// TODO - FIXME
$this->fixDIInit();
if (isset($this->userCache[$userId][$appName][$key])) {
if ($this->userCache[$userId][$appName][$key] === (string)$value) {
return;
} else if ($preCondition !== null && $this->userCache[$userId][$appName][$key] !== (string)$preCondition) {
return;
} else {
$qb = $this->connection->getQueryBuilder();
$qb->update('preferences')
->set('configvalue', $qb->createNamedParameter($value))
->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)))
->andWhere($qb->expr()->eq('appid', $qb->createNamedParameter($appName)))
->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
$qb->execute();
$this->userCache[$userId][$appName][$key] = $value;
return;
}
}
$preconditionArray = [];
if (isset($preCondition)) {
$preconditionArray = [