Version 1.1.0

openrightsgroup · Sep 18, 2012 · 0c67285 · 0c67285
1 parent b2f391a
commit 0c67285
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/core/components/formsave/processors/mgr/form/getdata.php b/core/components/formsave/processors/mgr/form/getdata.php
@@ -8,15 +8,9 @@
 
 $output = '';
 foreach($formArray['data'] as $key => $value) {
-<<<<<<< HEAD
 	if (is_array($value)) {
 		$value = implode(', ', $value);
 	}
-=======
-        if (is_array($value)) {
-            $value = json_encode($value);
-        }
->>>>>>> bb1a4e8605e0986c1aa986de6089cfcd2c616e07
 	$output .= $formSave->getChunk('fs.datarow', array(
 		'key' => $key,
 		'value' => $value