openrat-cms

commit 2b2a453039c77a6f5b018cc8a3b50ad39bec8f6c
parent 9c30202aeaaa68d9c070ae7b0cc560bd18120cd5
Author: Jan Dankert <devnull@localhost>
Date:   Mon, 20 Nov 2017 23:42:45 +0100

Fix: Globale Einstellungen aus der Custom-Konfiguration ohne Punkt müssen erhalten bleiben.

Diffstat:
action/ConfigurationAction.class.php
 | 
2
+-
util/Preferences.class.php
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/action/ConfigurationAction.class.php b/action/ConfigurationAction.class.php
@@ -44,7 +44,7 @@ class ConfigurationAction extends Action
 	 */
 	function showView()
 	{
-		require_once('./config/config-default.php');
+		require_once('./util/config-default.php');
 		$conf_default = $conf;
 		
 		$conf_cms = Session::getConfig();
diff --git a/util/Preferences.class.php b/util/Preferences.class.php
@@ -114,8 +114,8 @@ class Preferences
 					$customConfig[$parts[0]][$parts[1]][$parts[2]][$parts[3]][$parts[4]] = $value;
 				elseif	( count($parts)==6)
 					$customConfig[$parts[0]][$parts[1]][$parts[2]][$parts[3]][$parts[4]][$parts[5]] = $value;
+				unset( $customConfig[$key] );
 			}
-			unset( $customConfig[$key] );
 		}
 		
 		$conf = array_replace_recursive( $conf, $customConfig );