From 4dcad144525d36732c32fe7e53332503e1f4f74d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 5 Aug 2015 14:32:57 +0200 Subject: [PATCH] system: default did not reset due to faulty logic --- src/www/system_general.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/www/system_general.php b/src/www/system_general.php index 81e9d937b..1878370a9 100644 --- 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'])) { - /* default does not set anything for backwards compat */ - unset($config['system']['firmware']['mirror']); + if ($_POST['mirror'] == 'default') { + if (isset($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'])) { - /* default does not set anything for backwards compat */ - unset($config['system']['firmware']['flavour']); + if ($_POST['flavour'] == 'default') { + if (isset($config['system']['firmware']['flavour'])) { + /* default does not set anything for backwards compat */ + unset($config['system']['firmware']['flavour']); + } } else { $config['system']['firmware']['flavour'] = $_POST['flavour']; }