diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt index eb9d371843af27348827fc11a4b0a8e523245d9c..2037d9e3ce11a580168dd34a9fe2dab1c58f4281 100644 --- a/profiles/wcm_base/CHANGELOG.txt +++ b/profiles/wcm_base/CHANGELOG.txt @@ -1,3 +1,7 @@ +WCM Base 7.x-1.14-rc2, 2019-04-04 +--------------------------------- +- OCIO Media: Added PDF mimetype to document type missing since Panopoly 1.65. + WCM Base 7.x-1.14-rc1, 2019-04-03 --------------------------------- - WCM Base: Added WCM Timeline custom module. diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc index 2464cd93816f568cc6c32ca96cd4406d6651f0b7..bae20d1658a8d64a6b5ecf08a35bbc40a7696193 100644 --- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc +++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc @@ -47,6 +47,7 @@ function ocio_media_features_override_default_overrides() { $overrides["file_type.document.mimetypes|12"] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'; $overrides["file_type.document.mimetypes|13"] = 'application/acad'; $overrides["file_type.document.mimetypes|14"] = 'application/dxf'; + $overrides["file_type.document.mimetypes|16"] = 'application/pdf'; $overrides["file_type.document.mimetypes|4"] = 'application/zip'; $overrides["file_type.document.mimetypes|5"] = 'application/vnd.ms-powerpoint'; $overrides["file_type.document.mimetypes|6"] = 'application/vnd.oasis.opendocument.text'; diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc index fec8eb56f8a9821b2e9c9b26aaa3b41e7c5f9f8d..c034177955dc7a9512872947092ab18f4f6c904c 100644 --- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc +++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc @@ -88,17 +88,18 @@ function ocio_media_file_default_types_alter(&$data) { } if (isset($data['document'])) { $data['document']->disabled = FALSE; /* WAS: '' */ - $data['document']->mimetypes[10] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; /* WAS: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' */ - $data['document']->mimetypes[11] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; /* WAS: 'application/zip' */ - $data['document']->mimetypes[12] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'; /* WAS: 'application/x-7z-compressed' */ - $data['document']->mimetypes[13] = 'application/acad'; /* WAS: 'application/x-tar' */ - $data['document']->mimetypes[14] = 'application/dxf'; /* WAS: 'application/gzip' */ - $data['document']->mimetypes[4] = 'application/zip'; /* WAS: 'application/vnd.ms-powerpoint' */ - $data['document']->mimetypes[5] = 'application/vnd.ms-powerpoint'; /* WAS: 'application/vnd.oasis.opendocument.text' */ - $data['document']->mimetypes[6] = 'application/vnd.oasis.opendocument.text'; /* WAS: 'application/vnd.oasis.opendocument.spreadsheet' */ - $data['document']->mimetypes[7] = 'application/vnd.oasis.opendocument.spreadsheet'; /* WAS: 'application/vnd.oasis.opendocument.presentation' */ - $data['document']->mimetypes[8] = 'application/vnd.oasis.opendocument.presentation'; /* WAS: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' */ - $data['document']->mimetypes[9] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; /* WAS: 'application/vnd.openxmlformats-officedocument.presentationml.presentation' */ + $data['document']->mimetypes[10] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; /* WAS: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' */ + $data['document']->mimetypes[11] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; /* WAS: 'application/vnd.openxmlformats-officedocument.presentationml.presentation' */ + $data['document']->mimetypes[12] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'; /* WAS: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' */ + $data['document']->mimetypes[13] = 'application/acad'; /* WAS: 'application/zip' */ + $data['document']->mimetypes[14] = 'application/dxf'; /* WAS: 'application/x-7z-compressed' */ + $data['document']->mimetypes[16] = 'application/pdf'; /* WAS: 'application/gzip' */ + $data['document']->mimetypes[4] = 'application/zip'; /* WAS: 'application/vnd.ms-excel' */ + $data['document']->mimetypes[5] = 'application/vnd.ms-powerpoint'; /* WAS: 'application/pdf' */ + $data['document']->mimetypes[6] = 'application/vnd.oasis.opendocument.text'; /* WAS: 'application/vnd.ms-powerpoint' */ + $data['document']->mimetypes[7] = 'application/vnd.oasis.opendocument.spreadsheet'; /* WAS: 'application/vnd.oasis.opendocument.text' */ + $data['document']->mimetypes[8] = 'application/vnd.oasis.opendocument.presentation'; /* WAS: 'application/vnd.oasis.opendocument.spreadsheet' */ + $data['document']->mimetypes[9] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; /* WAS: 'application/vnd.oasis.opendocument.presentation' */ } if (isset($data['flash'])) { $data['flash']->disabled = TRUE; /* WAS: '' */ diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info index fa0c8fc78ab90637f7fad8036adf5c58b80a149f..cf370623c9aa1ef04cf553154f6396b15d32971d 100644 --- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info +++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info @@ -81,6 +81,7 @@ features[features_overrides][] = file_type.document.mimetypes|11 features[features_overrides][] = file_type.document.mimetypes|12 features[features_overrides][] = file_type.document.mimetypes|13 features[features_overrides][] = file_type.document.mimetypes|14 +features[features_overrides][] = file_type.document.mimetypes|16 features[features_overrides][] = file_type.document.mimetypes|4 features[features_overrides][] = file_type.document.mimetypes|5 features[features_overrides][] = file_type.document.mimetypes|6