8.2.10

SU-SWS · Nov 9, 2020 · ae25236 · ae25236
2 parents 584cf47 + 6d4c7dc
commit ae25236
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Stanford Media
 
+8.x-2.10
+--------------------------------------------------------------------------------
+_Release Date: 2020-11-06_
+
+- Allow `<a>` tags in embeddable code. (#71) (e58be88)
+- Add a check for when the mime type of the image is not known (08af22a)
+
 8.x-2.9
 --------------------------------------------------------------------------------
 _Release Date: 2020-10-05_

diff --git a/modules/media_duplicate_validation/media_duplicate_validation.info.yml b/modules/media_duplicate_validation/media_duplicate_validation.info.yml
@@ -2,7 +2,7 @@ name: 'Media Duplicate Validation'
 type: module
 description: 'Media Validation plugins to help prevent duplication of media items'
 core_version_requirement: ^8.8 || ^9
-version: 8.x-2.9
+version: 8.x-2.10
 package: media
 dependencies:
   - drupal:media
diff --git a/modules/media_duplicate_validation/src/Plugin/MediaDuplicateValidation/ColorMean.php b/modules/media_duplicate_validation/src/Plugin/MediaDuplicateValidation/ColorMean.php
@@ -241,6 +241,12 @@ protected function mimeType($path) {
    */
   protected function createImage($path) {
     $mime = $this->mimeType($path);
+    if (!$mime) {
+      // Unable to detect the mime type, so lets just build a fake array that
+      // Will still pass through the switch below.
+      $mime = [FALSE, FALSE, FALSE];
+    }
+
     switch ($mime[2]) {
       case 'jpg':
         return imagecreatefromjpeg($path);

diff --git a/src/Plugin/Field/FieldFormatter/EmbeddableFormatter.php b/src/Plugin/Field/FieldFormatter/EmbeddableFormatter.php
@@ -153,6 +153,7 @@ protected function viewUnstructuredElements(FieldItemListInterface $items, $lang
             'embed',
             'script',
             'div',
+            'a',
           ],
           '#prefix' => '<div class="embeddable-content">',
           '#suffix' => '</div>',

diff --git a/stanford_media.info.yml b/stanford_media.info.yml
@@ -3,7 +3,7 @@ description: Provides media module configuration and plugins.
 core_version_requirement: ^8.8 || ^9
 package: media
 type: module
-version: 8.x-2.9
+version: 8.x-2.10
 dependencies:
   - dropzonejs:dropzonejs
   - drupal:breakpoint