From 9f54d00d40c7674e3259dfeba617fa181039c696 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Mon, 8 Jan 2018 10:16:49 -0500
Subject: [PATCH] Revert "Issue #2775131 by chr.fritsch, marcoscano, katzilla,
 seanB, xjm, gippy, phenaproxima, alexpott, Berdir, lauriii, webflo, dawehner:
 Media entities should support contextual links"

This reverts commit 1da5a5ccb31a844127998907dddd76667a2bc16c.
---
 core/modules/media/templates/media.html.twig  |  5 ---
 .../Functional/MediaContextualLinksTest.php   | 45 -------------------
 .../classy/templates/content/media.html.twig  |  5 ---
 .../stable/templates/content/media.html.twig  |  5 ---
 4 files changed, 60 deletions(-)
 delete mode 100644 core/modules/media/tests/src/Functional/MediaContextualLinksTest.php

diff --git a/core/modules/media/templates/media.html.twig b/core/modules/media/templates/media.html.twig
index 6b3d6b3f0a..28c0a83ca6 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 1d97773143..0000000000
--- 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 6728367c0b..f36975cb9a 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 cecaac8b19..769b7be751 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 %}
-- 
GitLab