system: default did not reset due to faulty logic

4dcad144 · Franco Fichtner · 6c3e5c0b · 4dcad144
Commit 4dcad144 authored Aug 05, 2015 by Franco Fichtner
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

system_general.php src/www/system_general.php +10 -6

No files found.
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -221,15 +221,19 @@ if ($_POST) {
 		if (!isset($config['system']['firmware'])) {
 			$config['system']['firmware'] = array();
 		}
-		if ($_POST['mirror'] == 'default' && isset($config['system']['firmware']['mirror'])) {
+		if ($_POST['mirror'] == 'default') {
-			/* default does not set anything for backwards compat */
+			if (isset($config['system']['firmware']['mirror'])) {
-			unset($config['system']['firmware']['mirror']);
+				/* default does not set anything for backwards compat */
+				unset($config['system']['firmware']['mirror']);
+			}
 		} else {
 			$config['system']['firmware']['mirror'] = $_POST['mirror'];
 		}
-		if ($_POST['flavour'] == 'default' && isset($config['system']['firmware']['flavour'])) {
+		if ($_POST['flavour'] == 'default') {
-			/* default does not set anything for backwards compat */
+			if (isset($config['system']['firmware']['flavour'])) {
-			unset($config['system']['firmware']['flavour']);
+				/* default does not set anything for backwards compat */
+				unset($config['system']['firmware']['flavour']);
+			}
 		} else {
 			$config['system']['firmware']['flavour'] = $_POST['flavour'];
 		}