Merge pull request #1771 from phil-davis/patch-2

This commit is contained in:
Renato Botelho 2015-07-21 13:50:03 -03:00
commit 0ec6cc2900

View File

@ -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();