node_export-1911638_2.patch 522 B

12345678910111213
  1. Index: node_export.module
  2. ===================================================================
  3. --- node_export.module (revision 172)
  4. +++ node_export.module (working copy)
  5. @@ -1146,7 +1146,7 @@
  6. if (!empty($query)) {
  7. watchdog('node_export', 'kept existing managed file at uri "%uri"', array('%uri' => $file->uri), WATCHDOG_NOTICE);
  8. - $file = file_load(array_shift($query));
  9. + $file = (object) array_merge((array) $file, (array) file_load(array_shift($query)));
  10. }
  11. $file = file_save($file);