Merge pull request #8446 from hregis/develop_dict

Fix: Parameter must be an array or an object that implements Countable
Dolibarr · Mar 24, 2018 · 0a2db0d · 0a2db0d
2 parents 630ed04 + 47ea5a8
commit 0a2db0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php
@@ -1038,7 +1038,7 @@ public function loadCacheTypesTickets()
     {
         global $langs;
 
-        if (count($this->cache_types_tickets)) {
+        if (! empty($this->cache_types_tickets) && count($this->cache_types_tickets)) {
             return 0;
         }
         // Cache deja charge
@@ -1078,7 +1078,7 @@ public function loadCacheCategoriesTickets()
     {
         global $langs;
 
-        if (count($this->cache_category_tickets)) {
+        if (! empty($this->cache_category_ticket) && count($this->cache_category_tickets)) {
             return 0;
         }
         // Cache deja charge
@@ -1118,7 +1118,7 @@ public function loadCacheSeveritiesTickets()
     {
         global $langs;
 
-        if (count($this->cache_severity_tickets)) {
+        if (! empty($this->cache_severity_tickets) && count($this->cache_severity_tickets)) {
             return 0;
         }
         // Cache deja charge

diff --git a/htdocs/ticketsup/index.php b/htdocs/ticketsup/index.php
@@ -215,7 +215,7 @@
 print '<tr><td>';
 
 // don't display graph if no series
-if (count($dataseries) >1) {
+if (! empty($dataseries) && count($dataseries) > 1) {
     $data = array();
     foreach ($dataseries as $key => $value) {
         $data[] = array($value['label'], $value['data']);