From 7954d4c4a719bb1e9f929efdf398cb30382c7e89 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 11 Nov 2014 23:43:05 +1300
Subject: [PATCH] when there's a fire, pour a lot of water over it!! fixes
#6485
---
core/DataTable/Row.php | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index a90855a1d9..c6c0d21e9f 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -640,10 +640,7 @@ class Row implements \ArrayAccess, \IteratorAggregate
return $newValue;
}
- if (is_string($columnToSumValue)) {
- throw new Exception("Trying to add two strings in DataTable\Row::sumRowArray: "
- . "'$thisColumnValue' + '$columnToSumValue'" . " for row " . $this->__toString());
- }
+ $this->warnWhenSummingTwoStrings($thisColumnValue, $columnToSumValue);
return 0;
}
@@ -761,4 +758,16 @@ class Row implements \ArrayAccess, \IteratorAggregate
}
}
+ protected function warnWhenSummingTwoStrings($thisColumnValue, $columnToSumValue)
+ {
+ if (is_string($columnToSumValue)) {
+ Log::warning(
+ "Trying to add two strings in DataTable\Row::sumRowArray: %s + %s for row %s",
+ $thisColumnValue,
+ $columnToSumValue,
+ $this->__toString()
+ );
+ }
+ }
+
}
--
GitLab