prioritize config.php

ArtificialOwl · ArtificialOwl · commit c896d3c5176e · 2021-03-09T18:01:03.000-01:00
Signed-off-by: Maxence Lange &lt;maxence@artificial-owl.com&gt;
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
@@ -312,6 +312,10 @@ public function getAppValue($key) {
 			$defaultValue = $this->defaults[$key];
 		}
 
+		if ($this->config->getSystemValue('circles.' . $key, '') !== '') {
+			return $this->config->getSystemValue('circles.' . $key);
+		}
+
 		return $this->config->getAppValue($this->appName, $key, $defaultValue);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,10 @@ public function getAppValue($key) {`
`312`	`312`	`$defaultValue = $this->defaults[$key];`
`313`	`313`	`}`
`314`	`314`
	`315`	`+ if ($this->config->getSystemValue('circles.' . $key, '') !== '') {`
	`316`	`+ return $this->config->getSystemValue('circles.' . $key);`
	`317`	`+ }`
	`318`	`+`
`315`	`319`	`return $this->config->getAppValue($this->appName, $key, $defaultValue);`
`316`	`320`	`}`
`317`	`321`