Index: sites/all/modules/cck/includes/content.diff.inc
===================================================================
--- sites/all/modules/cck/includes/content.diff.inc	(revision 6)
+++ sites/all/modules/cck/includes/content.diff.inc	(working copy)
@@ -56,9 +56,11 @@
 function content_content_diff_values($node, $field, $items) {
   $return = array();
   foreach ($items as $item) {
-    foreach (explode("\n", $item['value']) as $i) {
-      $return[] = $i;
-    }
+  	if (!is_array($item)) {
+	    foreach (explode("\n", $item['value']) as $i) {
+	      $return[] = $i;
+	    }
+		}
   }
   return $return;
 }