summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-08-16 10:58:25 -0300
committerRenato Botelho <renato@netgate.com>2017-08-16 11:03:20 -0300
commit866e537d5b1110fe3f7bc00eff6d2a4213d6b841 (patch)
treea95690eb6b0160c22116436987accc4adcc11e48 /src/etc
parentf6b65ad83d141da19e70bd9ced41d1d937013e56 (diff)
downloadpfsense-866e537d5b1110fe3f7bc00eff6d2a4213d6b841.zip
pfsense-866e537d5b1110fe3f7bc00eff6d2a4213d6b841.tar.gz
Do not use reference to avoid losing data
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/config.lib.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc
index e0172c7..988c9b8 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -355,7 +355,7 @@ function convert_config() {
if (!is_array($config['system']['already_run_config_upgrade'])) {
$config['system']['already_run_config_upgrade'] = array();
}
- $already_run =& $config['system']['already_run_config_upgrade'];
+ $already_run = $config['system']['already_run_config_upgrade'];
/* Loop and run upgrade_VER_to_VER() until we're at current version */
while ($config['version'] < $g['latest_config']) {
@@ -371,7 +371,9 @@ function convert_config() {
}
if (isset($already_run[$migration_function])) {
/* Already executed, skip now */
- unset($already_run[$migration_function]);
+ unset($config['system']
+ ['already_run_config_upgrade']
+ [$migration_function]);
} else {
$migration_function();
}
OpenPOWER on IntegriCloud