summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/modules/media/templates/media.html.twig5
-rw-r--r--core/modules/media/tests/src/Functional/MediaContextualLinksTest.php45
-rw-r--r--core/themes/classy/templates/content/media.html.twig5
-rw-r--r--core/themes/stable/templates/content/media.html.twig5
4 files changed, 0 insertions, 60 deletions
diff --git a/core/modules/media/templates/media.html.twig b/core/modules/media/templates/media.html.twig
index 6b3d6b3..28c0a83 100644
--- a/core/modules/media/templates/media.html.twig
+++ b/core/modules/media/templates/media.html.twig
@@ -26,16 +26,11 @@
* - title_attributes: Same as attributes, except applied to the main title
* tag that appears in the template.
*
- * Note that we print {{ title_suffix }} even though the title is not included.
- * This is intentional, once contextual links are embedded in the "title_suffix"
- * variable. See #2775131 for more information on the background about this.
- *
* @see template_preprocess_media()
*
* @ingroup themeable
*/
#}
<div{{ attributes }}>
- {{ title_suffix }}
{{ content }}
</div>
diff --git a/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php b/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php
deleted file mode 100644
index 1d97773..0000000
--- a/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\Tests\media\Functional;
-
-use Drupal\media\Entity\Media;
-
-/**
- * Tests views contextual links on media items.
- *
- * @group media
- */
-class MediaContextualLinksTest extends MediaFunctionalTestBase {
-
- /**
- * {@inheritdoc}
- */
- public static $modules = [
- 'contextual',
- ];
-
- /**
- * Tests contextual links.
- */
- public function testMediaContextualLinks() {
- // Create a media type.
- $mediaType = $this->createMediaType();
-
- // Create a media item.
- $media = Media::create([
- 'bundle' => $mediaType->id(),
- 'name' => 'Unnamed',
- ]);
- $media->save();
-
- $user = $this->drupalCreateUser([
- 'administer media',
- 'access contextual links',
- ]);
- $this->drupalLogin($user);
-
- $this->drupalGet('media/' . $media->id());
- $this->assertSession()->elementAttributeContains('css', 'div[data-contextual-id]', 'data-contextual-id', 'media:media=' . $media->id() . ':');
- }
-
-}
diff --git a/core/themes/classy/templates/content/media.html.twig b/core/themes/classy/templates/content/media.html.twig
index 6728367..f36975c 100644
--- a/core/themes/classy/templates/content/media.html.twig
+++ b/core/themes/classy/templates/content/media.html.twig
@@ -7,10 +7,6 @@
* - name: Name of the media.
* - content: Media content.
*
- * Note that we print {{ title_suffix }} even though the title is not included.
- * This is intentional, once contextual links are embedded in the "title_suffix"
- * variable. See #2775131 for more information on the background about this.
- *
* @see template_preprocess_media()
*
* @ingroup themeable
@@ -25,7 +21,6 @@
]
%}
<article{{ attributes.addClass(classes) }}>
- {{ title_suffix }}
{% if content %}
{{ content }}
{% endif %}
diff --git a/core/themes/stable/templates/content/media.html.twig b/core/themes/stable/templates/content/media.html.twig
index cecaac8..769b7be 100644
--- a/core/themes/stable/templates/content/media.html.twig
+++ b/core/themes/stable/templates/content/media.html.twig
@@ -7,17 +7,12 @@
* - name: Name of the media.
* - content: Media content.
*
- * Note that we print {{ title_suffix }} even though the title is not included.
- * This is intentional, once contextual links are embedded in the "title_suffix"
- * variable. See #2775131 for more information on the background about this.
- *
* @see template_preprocess_media()
*
* @ingroup themeable
*/
#}
<article{{ attributes }}>
- {{ title_suffix }}
{% if content %}
{{ content }}
{% endif %}