From ebd2641baa6320dbbe96930e29da963dd7445425 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 3 Jan 2014 19:02:44 +0100
Subject: Handle default config values better

---
 modules/baseconfig.inc.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'modules/baseconfig.inc.php')

diff --git a/modules/baseconfig.inc.php b/modules/baseconfig.inc.php
index f6f4188f..4f9bd92f 100644
--- a/modules/baseconfig.inc.php
+++ b/modules/baseconfig.inc.php
@@ -32,12 +32,10 @@ if (isset($_POST['setting']) && is_array($_POST['setting'])) {
 				$qry_values = ', :' . $item['name'];
 			}
 			// Load all existing config options to validate input
-			$settings = array();
 			$res = Database::simpleQuery('SELECT setting, validator FROM setting');
 			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-				$settings[$row['setting']] = $row['validator'];
-			}
-			foreach ($settings as $key => $validator) {
+				$key = $row['setting'];
+				$validator = $row['validator'];
 				$input = (isset($_POST['setting'][$key]) ? $_POST['setting'][$key] : '');
 				// Validate data first!
 				$value = Validator::validate($validator, $input);
@@ -81,6 +79,7 @@ function render_module()
 		ORDER BY setting ASC'); // TODO: Add setting groups and sort order
 	while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 		$row['description'] = Util::markup($row['description']);
+		if (is_null($row['value'])) $row['value'] = $row['defaultvalue'];
 		$row['big'] = false;
 		$settings[] = $row;
 	}
-- 
cgit v1.2.3-55-g7522