From 577a8a730f79bf3605f5826fbd1affe16747e3f7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 16 Nov 2016 18:52:32 +0100
Subject: [PATCH] Use getvalue to fetch the value
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/AllConfig.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
index cd1d5f69ac1..4e13d70371b 100644
--- a/lib/private/AllConfig.php
+++ b/lib/private/AllConfig.php
@@ -215,13 +215,12 @@ class AllConfig implements \OCP\IConfig {
// TODO - FIXME
$this->fixDIInit();
- // warm up the cache to avoid updating the value if it is already set to this value before
- $this->getUserValue($userId, $appName, $key);
+ $prevValue = $this->getUserValue($userId, $appName, $key, null);
- if (isset($this->userCache[$userId][$appName][$key])) {
- if ($this->userCache[$userId][$appName][$key] === (string)$value) {
+ if ($prevValue !== null) {
+ if ($prevValue === (string)$value) {
return;
- } else if ($preCondition !== null && $this->userCache[$userId][$appName][$key] !== (string)$preCondition) {
+ } else if ($preCondition !== null && $prevValue !== (string)$preCondition) {
throw new PreConditionNotMetException();
} else {
$qb = $this->connection->getQueryBuilder();
--
GitLab