? matrix.530252.3.patch
Index: matrix.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/matrix/matrix.module,v
retrieving revision 1.2.4.8.2.28
diff -u -p -r1.2.4.8.2.28 matrix.module
--- matrix.module	24 Jul 2009 20:51:49 -0000	1.2.4.8.2.28
+++ matrix.module	27 Jul 2009 23:35:52 -0000
@@ -740,8 +740,10 @@ function matrix_format_prepare($field_in
   }
   
   //prepare the data - this will either live in $field_info['data'] (defaut formatter) or in $item (.tpl.php file)
-  if (isset($item)) {
+  if (!is_array($field_info['data'])) {
     $field_info['data'] = array();
+  }
+  if (isset($item)) {
     ksort($item);
     foreach ($item as $key => $value) {
       if (is_numeric($key)) {
@@ -1050,4 +1052,4 @@ print_r($form_state);
 
   // Final rendering callback.
   drupal_json(array('status' => TRUE, 'data' => $output));
-}
\ No newline at end of file
+}