From d48b756981123181c5aea073d55be8989622498b Mon Sep 17 00:00:00 2001 From: Brandon Weigel Date: Mon, 27 May 2019 13:48:38 +0000 Subject: [PATCH] get rid of deprecation stuff --- includes/tuque_wrapper.inc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index 9f0fbf61..3b08a9fd 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -253,16 +253,6 @@ class IslandoraFedoraObject extends FedoraObject { return $ret; } catch (Exception $e) { - if ($e instanceof DatastreamExistsException && variable_get('islandora_deprecation_return_false_when_datastream_exists', TRUE)) { - // @codingStandardsIgnoreLine - @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( - '@dsid' => $datastream->id, - '@pid' => $object->id, - )); - trigger_error(filter_xss($message_error), E_USER_NOTICE); - return FALSE; - } watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid
code: @code
message: @msg', array( '@pid' => $object->id, '@dsid' => $datastream->id,