diff options
author | Pim van den Berg | 2013-10-09 22:46:47 +0200 |
---|---|---|
committer | Pim van den Berg | 2013-10-09 22:46:47 +0200 |
commit | 1aab1e38b61242d4d19e65719a9682827d92853c (patch) | |
tree | bbdec43e60cf3118f5c2154c1acc421fc5521b3b /type/GenericStacked.class.php | |
parent | type: fix undefined index in ds_names[$source] before empty check (diff) | |
download | apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.zip apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.tar.gz apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.tar.bz2 apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.tar.xz |
Revert "type: fix undefined index in ds_names[$source] before empty check"
From the docs:
"No warning is generated if the variable does not exist. That means empty() is
essentially the concise equivalent to !isset($var) || $var == false."
This reverts commit f2a4593558b3a3ec696e9cc1de93fa898b9521bb.
Reported-By: Benoit Monin (https://github.com/pommi/CGP/commit/f2a4593)
Diffstat (limited to 'type/GenericStacked.class.php')
-rw-r--r-- | type/GenericStacked.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php index 42a252a..3f249c7 100644 --- a/type/GenericStacked.class.php +++ b/type/GenericStacked.class.php | |||
@@ -49,7 +49,7 @@ class Type_GenericStacked extends Type_Default { | |||
49 | 49 | ||
50 | $c = 0; | 50 | $c = 0; |
51 | foreach ($sources as $source) { | 51 | foreach ($sources as $source) { |
52 | $dsname = (isset($this->ds_names[$source]) && !empty($this->ds_names[$source])) ? $this->ds_names[$source] : $source; | 52 | $dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source]; |
53 | $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors; | 53 | $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors; |
54 | $rrdgraph[] = sprintf('"LINE1:area_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname)); | 54 | $rrdgraph[] = sprintf('"LINE1:area_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname)); |
55 | $rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format); | 55 | $rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format); |