3078,3090c3078,3122
<   if ($node->media_mover) {
<     // build a list of all the media mover files associated with this node
<     foreach ($node->media_mover as $cid => $mm_files) {
<       if ($mm_files) {
<         foreach ($mm_files as $mm_file) {
<           // load the configuration for this file
<           $config = media_mover_api_get_configuration($mm_file['cid']);
<           // check and see if this media mover file comes from a drupal file AND the
<           // drupal file will be removed  AND the configuration removes files
<           if ($node->files[$mm_file['fid']]->remove && $config->settings->mma_node_item_delete ) {
<             media_mover_api_file_delete_call($mm_file);
<           }
<         }
---
>   if (empty($node->media_mover)){
>     $media_mover = media_mover_api_node_files_fetch($node->nid);
> 	if ($media_mover){
>       $node->media_mover = $media_mover;
> 	} else {
> 	  return;  // no media-mover files in this node
> 	}
>   } 
> 
>   // build a list of all the media mover files associated with this node
>   foreach ($node->media_mover as $cid => $mm_files) {
>     if ($mm_files) {
>       foreach ($mm_files as $mm_file) {
> 	  	$node_file_deleted = false; // bool:  user deleted file attached to node 
> 		$field_file_deleted = false; // bool:  user deleted filefield file
> 		$mm_fid = $mm_file['fid'];
> 		// if file was attached to node, check if it is marked for removal
> 		if ($node->files[$mm_fid]){ 
> 		    if ($node->files[$mm_file['fid']]->remove){ 
> 			   $node_file_deleted = true;
> 			}
> 		} 
> 		// if file was attached to a filefield, check if field has been deleted
> 		else if (module_exists('mm_cck')){ 
> 		    $config = media_mover_api_get_configuration($mm_file['cid']);
> 		    $harvest_fields = array_keys($config->harvest->configuration[mm_config_harvest_field]);
> 		    $found = false;
> 			foreach ($harvest_fields as $field){
> 			  if ($found) {break;}
> 			  foreach ($node->{$field} as $index=>$field_data){
> 			    if ($field_data['fid']==$mm_fid){
> 				  $found = true;
> 				  break;
> 				}
> 			  }
> 			}
> 			if (!$found){
> 			  $field_file_deleted = true;
> 			}
> 		}
> 		if (($node_file_deleted && $config->settings->mma_node_item_delete) || $field_file_deleted){
> 		  media_mover_api_file_delete_call($mm_file);
> 		  $fid = $mm_file['fid'];
> 		  db_query('DELETE FROM {files} WHERE fid = "%d"', $fid);
> 		} 
3093,3094d3124
<     // now reset the nodes media mover cache
<     cache_clear_all('media_mover_files_node_'. $node->nid, 'cache_media_mover');
3095a3126,3127
>   // now reset the nodes media mover cache
>   cache_clear_all('media_mover_files_node_'. $node->nid, 'cache_media_mover');
3096a3129
>