Tweak to calculations in CSV. Export formatted for non-raw, JSON only…

… for raw.
Fabrik · Aug 13, 2017 · fab784a · fab784a
1 parent 349c2c5
commit fab784a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/components/com_fabrik/models/csvexport.php b/components/com_fabrik/models/csvexport.php
@@ -483,11 +483,12 @@ protected function addCalculations($a, &$str)
 
 							if (count($json) == 1)
 							{
-								$default = $json['Total']->value;
+								$default = $defaultRaw = $json['Total']->value;
 							}
 							else
 							{
-								$default = json_encode($json);
+								$default = strip_tags($calcs[$calKey][$aKey]);
+								$defaultRaw = json_encode($json);
 							}
 						}
 
@@ -524,7 +525,7 @@ protected function addCalculations($a, &$str)
 
 							if ($incRaw)
 							{
-								$calculations[$calKey][$x + 1] = $default;
+								$calculations[$calKey][$x + 1] = $defaultRaw;
 							}
 						}
 					}