From 525283cb9ccff19955f4b9a4ef3c66d77f5ba528 Mon Sep 17 00:00:00 2001
From: Jared Whiklo <jwhiklo@gmail.com>
Date: Fri, 3 May 2019 09:36:33 -0500
Subject: [PATCH] Coder

---
 README.md                  |  2 --
 includes/tuque_wrapper.inc |  8 --------
 islandora.install          | 12 ++++++++++++
 islandora.module           |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4cb3cf4f..1c829099 100644
--- a/README.md
+++ b/README.md
@@ -69,8 +69,6 @@ Further documentation for this module is available at [our documentation wiki](h
 
 ## Troubleshooting/Issues
 
-NOTE: There has been a function signature change for the `ingestDatastream` function within Tuque which will be deprecated after the 7.x-1.10 release. To read about it in detail please see the [JIRA ticket](https://jira.duraspace.org/browse/ISLANDORA-1995). For the time being there is a warning stating that this will become deprecated and that code that utilizes this specific behavior should be updated. Once this code is updated the `islandora_deprecation_return_false_when_datastream_exists` variable may be set to FALSE so the warning no longer displays. An example for doing this with drush: `drush vset islandora_deprecation_return_false_when_datastream_exists FALSE`.
-
 Having problems or solved a problem? Check out the Islandora google groups for a solution.
 
 * [Islandora Group](https://groups.google.com/forum/?hl=en&fromgroups#!forum/islandora)
diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc
index 5295de83..3b08a9fd 100644
--- a/includes/tuque_wrapper.inc
+++ b/includes/tuque_wrapper.inc
@@ -253,14 +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)) {
-        $message = format_string('The datastream @dsid already exists on the object: @pid. As of 7.x-1.10 the function signature for ingestDatastream will be changed from returning FALSE on failure to throwing an exception.', array(
-          '@dsid' => $datastream->id,
-          '@pid' => $object->id,
-        ));
-        trigger_error(filter_xss($message), E_USER_DEPRECATED);
-        return FALSE;
-      }
       watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid</br>code: @code<br/>message: @msg', array(
         '@pid' => $object->id,
         '@dsid' => $datastream->id,
diff --git a/islandora.install b/islandora.install
index ef3c570f..ec3b9111 100644
--- a/islandora.install
+++ b/islandora.install
@@ -133,3 +133,15 @@ function islandora_update_7001(&$sandbox) {
   $t = get_t();
   return $t("Islandora database updates complete");
 }
+
+/**
+ * Implements hook_update_N().
+ *
+ * Removing old variable around changes to ingestDatastream signature.
+ * These changes are complete and deprecation warnings are removed.
+ */
+function islandora_update_7002() {
+  // Removing as the deprecation has been removed.
+  variable_del('islandora_deprecation_return_false_when_datastream_exists');
+}
+
diff --git a/islandora.module b/islandora.module
index a72f4fb7..eeae14ec 100644
--- a/islandora.module
+++ b/islandora.module
@@ -663,7 +663,7 @@ function islandora_i18n_string_info() {
 }
 
 /**
- * Implements islandora_i18n_string_list().
+ * Implements hook_i18n_string_list().
  */
 function islandora_i18n_string_list($group) {
   if ($group == 'islandora') {