diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-16 09:31:33 -0200 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-16 09:31:33 -0200 |
| commit | 39a8090a5a9ee447442ca6da154b0005b7e1bf80 (patch) | |
| tree | fd327d4c1ebda352a39afdf83c0a9bf09f7c3b5f /etc/inc/shaper.inc | |
| parent | 129841508a5659a2c428213e0b231f9132fbfc4a (diff) | |
| parent | e6b960ccffd51fd6a2ad190760f029608051f478 (diff) | |
| download | pfsense-39a8090a5a9ee447442ca6da154b0005b7e1bf80.zip pfsense-39a8090a5a9ee447442ca6da154b0005b7e1bf80.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/PEAR.inc
etc/inc/filter.inc
Diffstat (limited to 'etc/inc/shaper.inc')
| -rw-r--r-- | etc/inc/shaper.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 8c1610a..11f89c9 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -3782,7 +3782,7 @@ function &get_unique_queue_list() { $qlist = array(); if (is_array($altq_list_queues)) { foreach ($altq_list_queues as $altq) { - if ($altq->GetEnabled()) + if ($altq->GetEnabled() == "") continue; $tmplist =& $altq->get_queue_list(); foreach ($tmplist as $qname => $link) { |
