diff options
| author | Renato Botelho <renato@netgate.com> | 2015-07-27 14:53:22 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-07-27 14:53:22 -0300 |
| commit | f8948f8637756d55642b9adabe9e8d7923ac98ff (patch) | |
| tree | 1f9d86a55d6c452323b51bd44d44bf9d435fd535 /etc | |
| parent | 626ed2abdd3a8a46ef6552b2f5db62b208af7006 (diff) | |
| parent | 2b869fa154626160a4ef4105199d83485831d9ec (diff) | |
| download | pfsense-f8948f8637756d55642b9adabe9e8d7923ac98ff.zip pfsense-f8948f8637756d55642b9adabe9e8d7923ac98ff.tar.gz | |
Merge pull request #1797 from phil-davis/patch-10
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index b3215a5..22b0be0 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2307,7 +2307,7 @@ function process_alias_urltable($name, $url, $freq, $forceupdate=false) { if (download_file($url, $urltable_filename . ".tmp", $verify_ssl)) { mwexec("/usr/bin/sed -E 's/\;.*//g; /^[[:space:]]*($|#)/d' ". escapeshellarg($urltable_filename . ".tmp") . " > " . escapeshellarg($urltable_filename)); if (alias_get_type($name) == "urltable_ports") { - $ports = explode("\n", file_get_contents($urltable_filename)); + $ports = explode("\n", str_replace("\r", "", file_get_contents($urltable_filename))); $ports = group_ports($ports); file_put_contents($urltable_filename, implode("\n", $ports)); } |
