diff --git a/includes/datastream.inc b/includes/datastream.inc index 9bc94f2d..b817b70d 100644 --- a/includes/datastream.inc +++ b/includes/datastream.inc @@ -43,6 +43,7 @@ function islandora_view_datastream(FedoraDatastream $datastream, $download = FAL } drupal_page_is_cacheable(FALSE); // Try not to load the file into PHP memory! + ob_end_flush(); $datastream->getContent('php://output'); exit(); } diff --git a/includes/solution_packs.inc b/includes/solution_packs.inc index 02952233..e1cf8478 100644 --- a/includes/solution_packs.inc +++ b/includes/solution_packs.inc @@ -186,12 +186,10 @@ function islandora_solution_pack_form_submit(array $form, array &$form_state) { * The context of this batch operation. */ function islandora_solution_pack_batch_operation_reingest_object(NewFedoraObject $object, array &$context) { - $deleted = FALSE; $existing_object = islandora_object_load($object->id); if ($existing_object) { $deleted = islandora_delete_object($existing_object); - $purged = $deleted && $existing_object == NULL; - if (!$purged) { + if (!$deleted) { $object_link = l($existing_object->label, "islandora/object/{$existing_object->id}"); drupal_set_message(t('Failed to purge existing object !object_link.', array( '!object_link' => $object_link,