2 files changed, 8 insertions, 4 deletions

diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index fda685d..761f7c4 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -9,7 +9,7 @@ function collectd_hosts() {
         global $CONFIG;
 
         if (!is_dir($CONFIG['datadir']))
-                return false;
+                return array();
 
         $dir = array_diff(scandir($CONFIG['datadir']), array('.', '..'));
         foreach($dir as $k => $v) {
@@ -17,7 +17,7 @@ function collectd_hosts() {
                         unset($dir[$k]);
         }
 
-        return $dir ? $dir : false;
+        return $dir;
 }
 
 
@@ -36,7 +36,7 @@ function get_host_rrd_files($dir) {
                 $files[] = str_replace($dir.'/', '', $object->getPathname());
         }
 
-        return $files ? $files : false;
+        return $files;
 }
 
 
diff --git a/type/Base.class.php b/type/Base.class.php
index ff9a235..1f42f4f 100644
--- a/type/Base.class.php
+++ b/type/Base.class.php
@@ -155,6 +155,10 @@ class Type_Base {
         function rrd_files() {
                 $files = $this->get_filenames();
 
+                $this->tinstances = array();
+                $this->files = array();
+                $this->identifiers = array();
+
                 foreach($files as $filename) {
                         $basename=basename($filename,'.rrd');
                         $instance = strpos($basename,'-')
@@ -186,7 +190,7 @@ class Type_Base {
 
                 $files = glob($this->datadir .'/'. $identifier . $wildcard . 'rrd');
 
-                return $files;
+                return $files ? $files : array();
         }
 
         function rrd_graph($debug = false) {