Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/filter.inc
	usr/local/www/themes/the_wall/rrdcolors.inc.php

1 files changed, 3 insertions, 3 deletions

diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index 433f659..2951450 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -459,14 +459,14 @@ function enable_rrd_graphing() {
 				if($g['booting']) {
 					$rrdqcommand = "-t ";
 					$rrducommand = "N";
-					$q = 0;
+					$qi = 0;
 					foreach ($qlist as $qname => $q) {
-						if($q == 0) {
+						if($qi == 0) {
 							$rrdqcommand .= "{$qname}";
 						} else {
 							$rrdqcommand .= ":{$qname}";
 						}
-						$q++;
+						$qi++;
 						$rrducommand .= ":U";
 					}
 					mwexec("$rrdtool update $rrddbpath$ifname$queues $rrdqcommand $rrducommand");