From 9956b38ae11ca0abd75a367f54009052a2126181 Mon Sep 17 00:00:00 2001 From: Seth Mos Date: Wed, 9 Mar 2011 08:20:27 +0100 Subject: Merge the config upgrade code, there was a mismatch, the one who merged this wrong should get a pointy hat. --- etc/inc/globals.inc | 2 +- etc/inc/upgrade_config.inc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'etc/inc') diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 21460c5..4e150f8 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -91,7 +91,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "7.7", + "latest_config" => "7.8", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index fee3786..df4ede8 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2308,6 +2308,14 @@ function upgrade_075_to_076() { function upgrade_076_to_077() { global $config; + foreach($config['filter']['rule'] as & $rule) { + if (isset($rule['protocol']) && !empty($rule['protocol'])) + $rule['protocol'] = strtolower($rule['protocol']); + } +} + +function upgrade_077_to_078() { + global $config; global $g; /* RRD files changed for quality, traffic and packets graphs */ -- cgit v1.1