From 1aab1e38b61242d4d19e65719a9682827d92853c Mon Sep 17 00:00:00 2001
From: Pim van den Berg
Date: Wed, 9 Oct 2013 22:46:47 +0200
Subject: 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)
---
 type/GenericIO.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'type/GenericIO.class.php')

diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php
index 4648294..231c098 100644
--- a/type/GenericIO.class.php
+++ b/type/GenericIO.class.php
@@ -56,7 +56,7 @@ class Type_GenericIO extends Type_Default {
 
 		$i = 0;
 		foreach($sources as $source) {
-			$dsname = (isset($this->ds_names[$source]) && !empty($this->ds_names[$source])) ? $this->ds_names[$source] : $source;
+			$dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
 			$rrdgraph[] = sprintf('"LINE1:avg_%s%s#%s:%s"', crc32hex($source), $i == 1 ? '_neg' : '', $this->colors[$source], $this->rrd_escape($dsname));
 			$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);
 			$rrdgraph[] = sprintf('"GPRINT:avg_%s:AVERAGE:%s Avg,"', crc32hex($source), $this->rrd_format);
-- 
cgit v1.1