Browse Source

Try again with Travis

pull/721/head
Brandon Weigel 5 years ago
parent
commit
5c32aee820
  1. 8
      includes/tuque_wrapper.inc

8
includes/tuque_wrapper.inc

@ -254,13 +254,13 @@ class IslandoraFedoraObject extends FedoraObject {
} }
catch (Exception $e) { catch (Exception $e) {
if ($e instanceof DatastreamExistsException && variable_get('islandora_deprecation_return_false_when_datastream_exists', TRUE)) { if ($e instanceof DatastreamExistsException && variable_get('islandora_deprecation_return_false_when_datastream_exists', TRUE)) {
$message_deprecated = format_string('Returning FALSE on ingestDatastream() is deprecated in islandora:7.x-1.10. See https://github.com/Islandora/islandora/pull/680/'); @trigger_error('Expecting FALSE on ingestDatastream failing is deprecated in islandora:7.x-1.10. Throwing an EXCEPTION on failed
datastream ingest will be the norm in future. See https://jira.duraspace.org/browse/ISLANDORA-1995.', E_USER_DEPRECATED);
$message_error = format_string('The datastream @dsid already exists on the object: @pid.', array( $message_error = format_string('The datastream @dsid already exists on the object: @pid.', array(
'@dsid' => $datastream->id, '@dsid' => $datastream->id, '@dsid' => $datastream->id,
'@pid' => $object->id, '@pid' => $object->id, '@pid' => $object->id,
)); ));
trigger_error(filter_xss($message_error), E_USER_NOTICE); trigger_error(filter_xss($message_error), E_USER_NOTICE);
trigger_error(filter_xss($message_deprecated), E_USER_DEPRECATED);
return FALSE; return FALSE;
} }
watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid</br>code: @code<br/>message: @msg', array( watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid</br>code: @code<br/>message: @msg', array(

Loading…
Cancel
Save