diff options
| author | Renato Botelho <renato@netgate.com> | 2015-07-21 13:50:03 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-07-21 13:50:03 -0300 |
| commit | 0ec6cc29006d0978e348e4393c4cf9ac89eddad3 (patch) | |
| tree | 6ad172ef26e720e30d3b4f5bc7094f53233d4b3c /etc/inc | |
| parent | cc781c44c848da01296c9439f7aa9c20d1862e61 (diff) | |
| parent | 348233566849a9ec5c53e4353e4effbd56c7620d (diff) | |
| download | pfsense-0ec6cc29006d0978e348e4393c4cf9ac89eddad3.zip pfsense-0ec6cc29006d0978e348e4393c4cf9ac89eddad3.tar.gz | |
Merge pull request #1771 from phil-davis/patch-2
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 2174b25..f2175ff 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3053,9 +3053,6 @@ function upgrade_085_to_086() { function upgrade_086_to_087() { global $config, $dummynet_pipe_list; - if (!is_array($config['filter']) || !is_array($config['filter']['rule'])) { - return; - } if (!is_array($config['dnshaper']) || !is_array($config['dnshaper']['queue'])) { return; } @@ -3076,6 +3073,10 @@ function upgrade_086_to_087() { unset($dnqueue_number, $dnpipe_number, $qidx, $idx, $dnpipe, $dnqueue); + if (!is_array($config['filter']) || !is_array($config['filter']['rule'])) { + return; + } + require_once("shaper.inc"); read_dummynet_config(); |
