Cache env config values as well

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
nextcloud · Mar 23, 2017 · 29245e6 · 29245e6
1 parent 6198b22
commit 29245e6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/private/Config.php b/lib/private/Config.php
@@ -85,15 +85,17 @@ public function getKeys() {
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
-		if ($envValue !== false) {
-			return $envValue;
-		}
 
 		if (isset($this->cache[$key])) {
 			return $this->cache[$key];
 		}
 
+		$envValue = getenv(self::ENV_PREFIX . $key);
+		if ($envValue !== false) {
+			$this->cache[$key] = $envValue;
+			return $envValue;
+		}
+
 		return $default;
 	}