Browse Source

format changes

pull/307/head
Alan Stanley 12 years ago
parent
commit
177aaced86
  1. 4
      includes/utilities.inc

4
includes/utilities.inc

@ -400,7 +400,7 @@ function islandora_get_datastreams_requirements_from_content_model(FedoraObject
$xml = new SimpleXMLElement($object[DS_COMP_STREAM]->content); $xml = new SimpleXMLElement($object[DS_COMP_STREAM]->content);
foreach ($xml->dsTypeModel as $ds) { foreach ($xml->dsTypeModel as $ds) {
$dsid = (string) $ds['ID']; $dsid = (string) $ds['ID'];
$optional = drupal_strtolower((string) $ds['optional']); $optional = strtolower((string) $ds['optional']);
$mime = array(); $mime = array();
foreach ($ds->form as $form) { foreach ($ds->form as $form) {
$mime[] = (string) $form['MIME']; $mime[] = (string) $form['MIME'];
@ -731,7 +731,7 @@ function islandora_get_content_models($ignore_system_namespace = TRUE) {
$label = $result['label']['value']; $label = $result['label']['value'];
$namespace = islandora_get_namespace($content_model); $namespace = islandora_get_namespace($content_model);
$ignore = $ignore_system_namespace && $namespace == 'fedora-system'; $ignore = $ignore_system_namespace && $namespace == 'fedora-system';
$ignore |= ! islandora_namespace_accessible($namespace); $ignore |= !islandora_namespace_accessible($namespace);
if (!$ignore) { if (!$ignore) {
$content_models[$content_model] = array('pid' => $content_model, 'label' => $label); $content_models[$content_model] = array('pid' => $content_model, 'label' => $label);
} }

Loading…
Cancel
Save