From 387ab31a976fbacfc0d8e2fde7efb7cb1c4b6b6b Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 15 Dec 2014 16:42:26 -0200 Subject: [PATCH] Use newline to separate unbound custom options during config upgrade, it should fix #4104 --- etc/inc/upgrade_config.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 41db4a8bb5..7035a7ce43 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3458,13 +3458,13 @@ function upgrade_110_to_111() { /* Following options were removed, bring them as custom_options */ if (isset($pkg['stats']) && $pkg['stats'] == "on") { if (isset($pkg['stats_interval'])) - $new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "statistics-interval: {$pkg['stats_interval']}"; + $new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "statistics-interval: {$pkg['stats_interval']}"; if (isset($pkg['cumulative_stats'])) - $new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "statistics-cumulative: {$pkg['cumulative_stats']}"; + $new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "statistics-cumulative: {$pkg['cumulative_stats']}"; if (isset($pkg['extended_stats']) && $pkg['extended_stats'] == "on") - $new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "extended-statistics: yes"; + $new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "extended-statistics: yes"; else - $new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "extended-statistics: no"; + $new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "extended-statistics: no"; } $new['acls'] = array();