Commit ad29083d authored by Dave Reid's avatar Dave Reid Committed by Damien McKenna
Browse files

Issue #3253736 by Dave Reid, zebda, DamienMcKenna: favicon meta tag was renamed in Drupal 9.3.0.

parent 6114ec02

CHANGELOG.txt

+2 −0
Changes for CHANGELOG.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ Metatag 8.x-1.x-dev, xxxx-xx-xx 
  implement ::doCount() instead of ::count().

#3252159 by DamienMcKenna, Eugene Bocharov: Fix tests compatibility with Drupal

  9.3.x.

#3253736 by Dave Reid, zebda, DamienMcKenna: favicon meta tag was renamed in

  Drupal 9.3.0.





Metatag 8.x-1.16, 2021-03-15

metatag_favicons/metatag_favicons.module

+2 −2
Changes for metatag_favicons/metatag_favicons.module: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ function metatag_favicons_page_attachments_alter(array &$attachments) { 


  // Remove the default shortcut icon if one was set by Metatag.

  foreach ($attachments['#attached']['html_head'] as $element) {

    if (isset($element[1]) && $element[1] == 'shortcut_icon') {

    if (isset($element[1]) && in_array($element[1], ['shortcut_icon', 'icon'])) {

      foreach ($attachments['#attached']['html_head_link'] as $key => $value) {

        if (isset($value[0]['rel']) && $value[0]['rel'] == 'shortcut icon') {

        if (isset($value[0]['rel']) && in_array($value[0]['rel'], ['shortcut_icon', 'icon'])) {

          unset($attachments['#attached']['html_head_link'][$key]);

        }

      }

metatag_favicons/src/Plugin/metatag/Tag/ShortcutIcon.php

+2 −2
Changes for metatag_favicons/src/Plugin/metatag/Tag/ShortcutIcon.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ use Drupal\metatag\Plugin\metatag\Tag\LinkRelBase; 
 *

 * @MetatagTag(

 *   id = "shortcut_icon",

 *   label = @Translation("Default shortcut icon"),

 *   label = @Translation("Default icon"),

 *   description = @Translation("The traditional favicon, must be either a GIF, ICO, JPG/JPEG or PNG image."),

 *   name = "shortcut icon",

 *   name = "icon",

 *   group = "favicons",

 *   weight = 1,

 *   type = "image",

metatag_favicons/tests/src/Functional/MetatagFaviconsTagsTest.php

+1 −1
Changes for metatag_favicons/tests/src/Functional/MetatagFaviconsTagsTest.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ class MetatagFaviconsTagsTest extends MetatagTagsTestBase { 
   * Implements {tag_name}TestTagName for 'shortcut icon'.

   */

  protected function shortcutIconTestTagName() {

    return 'shortcut icon';

    return 'icon';

  }



  /**