From b591e6510b787f2b5a16be6151fe28ff918d4703 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 9 Oct 2020 11:01:08 +0200 Subject: [PATCH 1/2] FIX avoid warning "Parameter must be an array" --- htdocs/core/class/dolgraph.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 0a1686c3585..5d6327c63b0 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -533,7 +533,7 @@ class DolGraph $vals = array(); $nblines = count($this->data); - $nbvalues = count($this->data[0]) - 1; + $nbvalues = (! empty($this->data[0]) ? count($this->data[0]) - 1 : 0); for ($j = 0; $j < $nblines; $j++) { @@ -562,7 +562,7 @@ class DolGraph $vals = array(); $nblines = count($this->data); - $nbvalues = count($this->data[0]) - 1; + $nbvalues = (! empty($this->data[0]) ? count($this->data[0]) - 1 : 0); for ($j = 0; $j < $nblines; $j++) { From 12391523681122caff3ec76176412eb531ba2957 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 9 Oct 2020 13:54:47 +0200 Subject: [PATCH 2/2] Update dolgraph.class.php --- htdocs/core/class/dolgraph.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 5d6327c63b0..dee727cb596 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -533,7 +533,7 @@ class DolGraph $vals = array(); $nblines = count($this->data); - $nbvalues = (! empty($this->data[0]) ? count($this->data[0]) - 1 : 0); + $nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1); for ($j = 0; $j < $nblines; $j++) { @@ -562,7 +562,7 @@ class DolGraph $vals = array(); $nblines = count($this->data); - $nbvalues = (! empty($this->data[0]) ? count($this->data[0]) - 1 : 0); + $nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1); for ($j = 0; $j < $nblines; $j++) {