From 023224a056bd73a33efefacd314322817f6df3fa Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 9 Aug 2016 12:03:59 +0200
Subject: [baseconfig] More minor fixes

---
 modules-available/baseconfig/page.inc.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'modules-available/baseconfig')

diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php
index 389aa0ce..0995a369 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -155,9 +155,9 @@ class Page_BaseConfig extends Page
 		}
 		// Add entries that weren't in the db (global), setup override checkbox (module specific)
 		foreach ($vars as $key => $var) {
-			if (isset($settings[$var['catid']]['settings'][$key]['enabled'])) {
+			if ($this->targetModule === false) {
 				// Global settings - honor enabled field in db
-				if ($settings[$var['catid']]['settings'][$key]['enabled'] == 1) {
+				if (!isset($settings[$var['catid']]['settings'][$key]['enabled']) || $settings[$var['catid']]['settings'][$key]['enabled'] == 1) {
 					$settings[$var['catid']]['settings'][$key]['checked'] = 'checked';
 				}
 			} elseif (isset($settings[$var['catid']]['settings'][$key])) {
@@ -273,9 +273,10 @@ class Page_BaseConfig extends Page
 		/* -- */
 
 		$parts = explode(':', $validator, 2);
-		$items = explode('|', $parts[1]);
+
 		if ($parts[0] === 'list') {
 
+			$items = explode('|', $parts[1]);
 			foreach ($items as $item) {
 				if ($item === $current) {
 					$inner .= "<option selected=\"selected\" value=\"$item\"> $item  </option>";
@@ -288,9 +289,9 @@ class Page_BaseConfig extends Page
 			unset($args['type']);
 			$current = '';
 
-		}
-		if ($parts[0] == 'multilist') {
+		} elseif ($parts[0] == 'multilist') {
 
+			$items = explode('|', $parts[1]);
 			$args['multiple'] = 'multiple';
 			$args['class'] 	 .= " multilist";
 			$args['name']    .= '[]';
-- 
cgit v1.2.3-55-g7522