From 6ebd3e7b0f23e14ae4c991c19a010c86a5483f30 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sat, 8 Mar 2014 19:39:28 +0100
Subject: [PATCH] Perfdata is not always a table

---
 modules/monitoring/application/views/helpers/Perfdata.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index bb9de66eb..2a5477cac 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -21,6 +21,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         $perfdata = preg_replace('~\'([^\']+)\'~e', "str_replace(' ', '\'', '$1')", $perfdata);
         $parts = preg_split('~\s+~', $perfdata, -1, PREG_SPLIT_NO_EMPTY);
 
+        $table = array();
         $result = '';
         if ($compact === true) {
             $compact = 5;
@@ -67,7 +68,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                      . implode(',', array($green, $orange, $red, $gray))
                      . '</div>';
             } else {
-                $result .= '<tr><th><div class="inlinepie" title="' . htmlspecialchars($name) . '" style="float: left; margin: 0.2em 0.5em 0.2em 0;">'
+                $table[] = '<tr><th><div class="inlinepie" title="' . htmlspecialchars($name) . '" style="float: left; margin: 0.2em 0.5em 0.2em 0;">'
                      . implode(',', array($green, $orange, $red, $gray))
                      . '</div>'
                      . htmlspecialchars($name)
@@ -80,8 +81,8 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         if ($result == '' && ! $compact) {
             $result = $perfdata;
         }
-        if (! $compact && $result !== '') {
-            $result = '<table class="perfdata">' . $result . '</table>';
+        if (! empty($table)) {
+            $result = '<table class="perfdata">' . implode("\n", $table) . '</table>' . $result;
         }
 
         return $result;