summaryrefslogtreecommitdiffstats
path: root/etc/inc/upgrade_config.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-01-05 12:57:53 -0200
committerRenato Botelho <garga@FreeBSD.org>2015-01-05 12:58:30 -0200
commit24149c31763abff0f25da381c58b22e6f9c44658 (patch)
tree694db8a5b4e12eb4fa26f98cac36f660835710c5 /etc/inc/upgrade_config.inc
parent7f5c26699473288e099f3927672c97b4980f3b0c (diff)
downloadpfsense-24149c31763abff0f25da381c58b22e6f9c44658.zip
pfsense-24149c31763abff0f25da381c58b22e6f9c44658.tar.gz
It's supposed to remove windows EOL here, not ;
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r--etc/inc/upgrade_config.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 21dd97f..324e51e 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3457,7 +3457,7 @@ function upgrade_110_to_111() {
}
if (isset($new['custom_options']) && !empty($new['custom_options']))
- $new['custom_options'] = str_replace(';', "\n", $new['custom_options']);
+ $new['custom_options'] = str_replace("\r\n", "\n", $new['custom_options']);
/* Following options were removed, bring them as custom_options */
if (isset($pkg['stats']) && $pkg['stats'] == "on") {
OpenPOWER on IntegriCloud