summaryrefslogtreecommitdiffstats
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:04 -0300
commitd3d9b707c00ff8414ebcae2e62c7392b92496e7d (patch)
treeb4678ea329eca22f4b11c84448889cb962b9057a
parent671e0b7f902797d283d0d5ef7b53520e515179c0 (diff)
downloadpfsense-d3d9b707c00ff8414ebcae2e62c7392b92496e7d.zip
pfsense-d3d9b707c00ff8414ebcae2e62c7392b92496e7d.tar.gz
Do not use reference to avoid losing data
-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 95459a1..5361d4e 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -456,7 +456,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']) {
@@ -472,7 +472,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