Merge pull request #506 from willtp87/7.x.post-release

removing deprecated constants

islandora.module

@@ -64,19 +64,6 @@ define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative');
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');
 define('ISLANDORA_MIME_TYPES_AUTOCOMPLETE', 'islandora/autocomplete/mime-types');
 
-/**
- * @deprecated Constants.
- */
-// @codingStandardsIgnoreStart
-define('DS_COMP_STREAM', ISLANDORA_DS_COMP_STREAM);
-define('FEDORA_VIEW_OBJECTS', ISLANDORA_VIEW_OBJECTS);
-define('FEDORA_METADATA_EDIT', ISLANDORA_METADATA_EDIT);
-define('FEDORA_ADD_DS', ISLANDORA_ADD_DS);
-define('FEDORA_INGEST', ISLANDORA_INGEST);
-define('FEDORA_PURGE', ISLANDORA_PURGE);
-define('FEDORA_MANAGE_PROPERTIES', ISLANDORA_MANAGE_PROPERTIES);
-// @codingStandardsIgnoreEnd
-
 /**
  * Implements hook_menu().
  *

tests/islandora_hooked_access_test.module

@@ -23,7 +23,7 @@ function islandora_hooked_access_test_islandora_object_access($op, $object, $use
  * Implements hook_islandora_datastream_access().
  */
 function islandora_hooked_access_test_islandora_datastream_access($op, $datastream, $user) {
-  if ($op == FEDORA_PURGE) {
+  if ($op == ISLANDORA_PURGE) {
     return FALSE;
   }
   if (isset($_SESSION['islandora_hooked_access_test']) && $_SESSION['islandora_hooked_access_test'] === func_get_args()) {