Browse Source

Merge pull request #211 from adam-vessey/7.x-check-object

Check load success before attempting to use objects.
pull/212/head
Jonathan Green 12 years ago
parent
commit
fb38281565
  1. 8
      includes/utilities.inc

8
includes/utilities.inc

@ -294,9 +294,11 @@ function islandora_get_datastreams_requirements(FedoraObject $object) {
*/ */
function islandora_get_datastreams_requirements_from_models(array $models) { function islandora_get_datastreams_requirements_from_models(array $models) {
$dsids = array(); $dsids = array();
foreach ($models as $model) { foreach ($models as $model_pid) {
$model = islandora_object_load($model); $model = islandora_object_load($model_pid);
$dsids += islandora_get_datastreams_requirements_from_content_model($model); if (isset($model) && $model) {
$dsids += islandora_get_datastreams_requirements_from_content_model($model);
}
} }
// The AUDIT Datastream can not really be added, so it can't really be missing. // The AUDIT Datastream can not really be added, so it can't really be missing.
unset($dsids['AUDIT']); unset($dsids['AUDIT']);

Loading…
Cancel
Save