Browse Source

datastream replacing mimes more accurate

pull/522/head
willtp87 11 years ago
parent
commit
9ea9eeed60
  1. 13
      includes/datastream.version.inc

13
includes/datastream.version.inc

@ -280,17 +280,16 @@ function islandora_datastream_version_replace_form($form, &$form_state, Abstract
$form_state['object_id'] = $object->id; $form_state['object_id'] = $object->id;
$form_state['dsid'] = $datastream->id; $form_state['dsid'] = $datastream->id;
$form_state['object'] = $object; $form_state['object'] = $object;
$extensions = islandora_get_object_extensions($object); $datastream_mime_map = islandora_get_object_extensions($object);
$mime_detect = new MimeDetect(); $mime_detect = new MimeDetect();
$ext = array(); $ext = array();
if (isset($extensions[$datastream->id])) { if (isset($datastream_mime_map[$datastream->id])) {
foreach ($extensions[$datastream->id]['mime'] as $key => $value) { foreach ($datastream_mime_map[$datastream->id]['mime'] as $key => $value) {
$str = $mime_detect->getExtension($value); $extensions = $mime_detect->getValidExtensions($value);
array_push($ext, $str); $ext = array_merge($ext, $extensions);
} }
} }
$comma = count($ext) > 1 ? "," : "";
$ext = array(implode($comma, $ext));
$upload_size = min((int) ini_get('post_max_size'), (int) ini_get('upload_max_filesize')); $upload_size = min((int) ini_get('post_max_size'), (int) ini_get('upload_max_filesize'));
return array( return array(
'dsid_fieldset' => array( 'dsid_fieldset' => array(

Loading…
Cancel
Save