@ -303,7 +303,7 @@ function islandora_islandora_edit_object($fedora_object) {
$supported_models = islandora_get_types();
$output = "";
foreach ($fedora_object->models as $model) {
if ($supported_models[$model][ISLANDORA_EDIT_HOOK] == TRUE) {//another module is handling the view
if (isset($supported_models[$model][ISLANDORA_EDIT_HOOK]) && $supported_models[$model][ISLANDORA_EDIT_HOOK] == TRUE) {//another module is handling the view
return;
}
}
@ -424,9 +424,16 @@ function islandora_islandora_view_object($object) {
if (isset($supported_models[$model][ISLANDORA_VIEW_HOOK]) && $supported_models[$model][ISLANDORA_VIEW_HOOK] == TRUE) {//another module is handling the view
return;
}
>>>>>>> a364874a78dd45f202ba5ef18292bf77f6bf591e
}
}
@ -519,5 +526,14 @@ function islandora_preprocess_islandora_default(&$variables) {
}
function islandora_preprocess_islandora_default_edit(&$variables) {