From 12620a4bf6bdc98b17532418adf9158225a58c57 Mon Sep 17 00:00:00 2001
From: Jordan Dukart <jordan@discoverygarden.ca>
Date: Tue, 14 Jan 2014 19:14:24 +0000
Subject: [PATCH] Make our datastream_access call work and revert change to
 themeing of version links.

---
 islandora.module |  2 +-
 theme/theme.inc  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/islandora.module b/islandora.module
index 6537ef21..9c1ae7d9 100644
--- a/islandora.module
+++ b/islandora.module
@@ -1839,7 +1839,7 @@ function islandora_islandora_datastream_access($op, AbstractDatastream $datastre
     $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object));
     foreach ($hooks as $hook) {
       if ($hook['destination_dsid'] == $datastream->id && ((isset($hook['source_dsid']) && isset($object[$hook['source_dsid']]) && islandora_datastream_access(ISLANDORA_VIEW_OBJECTS, $object[$hook['source_dsid']], $user)) || (array_key_exists('source_dsid', $hook) && $hook['source_dsid'] == NULL))) {
-        return TRUE;
+        return user_access(ISLANDORA_REGENERATE_DERIVATIVES);
       }
     }
     return FALSE;
diff --git a/theme/theme.inc b/theme/theme.inc
index 2d3fe898..b783cfa8 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -53,12 +53,14 @@ function islandora_preprocess_islandora_default_edit(array &$variables) {
       'class' => 'datastream-size',
       'data' => islandora_datastream_get_human_readable_size($ds),
     );
-    $row[] = array(
-      'class' => 'datastream-versions',
-      'data' => theme('islandora_datastream_version_link', array(
-        'datastream' => $ds,
-      )),
-    );
+    if (islandora_datastream_access(ISLANDORA_VIEW_DATASTREAM_HISTORY, $ds)) {
+      $row[] = array(
+        'class' => 'datastream-versions',
+        'data' => theme('islandora_datastream_version_link', array(
+          'datastream' => $ds,
+        )),
+      );
+    }
     $row[] = array(
       'class' => 'datastream-download',
       'data' => theme('islandora_datastream_download_link', array(