From 6e5a4ff8c78ff5373aba091baa66cae029557643 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 22 Jul 2025 21:49:05 +0200
Subject: [PATCH] Fix if setting found in db, but not found in plugins

---
 system/src/Settings.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/system/src/Settings.php b/system/src/Settings.php
index ca4192ad..ef3da830 100644
--- a/system/src/Settings.php
+++ b/system/src/Settings.php
@@ -472,24 +472,22 @@ class Settings implements \ArrayAccess
 			if (!isset($this->settingsFile[$pluginKeyName]['settings'])) {
 				throw new \RuntimeException('Unknown plugin settings: ' . $pluginKeyName);
 			}
+
 			return $this->settingsFile[$pluginKeyName]['settings'];
 		}
 
-		$ret = [];
-		if(isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
-			$ret = $this->settingsFile[$pluginKeyName]['settings'][$key];
+		if (!isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
+			return null;
 		}
 
+		$ret = $this->settingsFile[$pluginKeyName]['settings'][$key];
+
 		if(isset($this->settingsDatabase[$pluginKeyName][$key])) {
 			$value = $this->settingsDatabase[$pluginKeyName][$key];
 
 			$ret['value'] = $value;
 		}
 		else {
-			if (!isset($this->settingsFile[$pluginKeyName]['settings'][$key])) {
-				return null;
-			}
-
 			$ret['value'] = $this->settingsFile[$pluginKeyName]['settings'][$key]['default'];
 		}