3 files changed, 10 insertions, 4 deletions

diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index 3aef6b8..3467667 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -130,10 +130,10 @@ function group_plugindata($plugindata) {
 
 function plugin_sort($data) {
         foreach ($data as $key => $row) {
-                $pi[$key] = $row['pi'];
-                $c[$key] = $row['c'];
-                $ti[$key] = $row['ti'];
-                $t[$key] = $row['t'];
+                $pi[$key] = (isset($row['pi'])) ? $row['pi'] : null;
+                $c[$key]  = (isset($row['c']))  ? $row['c'] : null;
+                $ti[$key] = (isset($row['ti'])) ? $row['ti'] : null;
+                $t[$key]  = (isset($row['t']))  ? $row['t'] : null;
         }
 
         array_multisort($c, SORT_ASC, $pi, SORT_ASC, $t, SORT_ASC, $ti, SORT_ASC, $data);
diff --git a/type/Default.class.php b/type/Default.class.php
index 00ef0e4..0b6601e 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -243,6 +243,9 @@ class Type_Default {
 
                 if ($this->scale)
                         $raw = '_raw';
+                else
+                        $raw = null;
+
                 $i=0;
                 foreach ($this->tinstances as $tinstance) {
                         foreach ($this->data_sources as $ds) {
diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php
index d1da9ec..f306532 100644
--- a/type/GenericStacked.class.php
+++ b/type/GenericStacked.class.php
@@ -11,6 +11,9 @@ class Type_GenericStacked extends Type_Default {
 
                 if ($this->scale)
                         $raw = '_raw';
+                else
+                        $raw = null;
+
                 $i=0;
                 foreach ($this->tinstances as $tinstance) {
                         foreach ($this->data_sources as $ds) {