From ca7d68c983beb28d9730adb6de753f0a24aa4ec2 Mon Sep 17 00:00:00 2001
From: grobot <grobot@76026.no-reply.drupal.org>
Date: Mon, 9 Oct 2017 09:22:14 -0400
Subject: [PATCH] Issue #2910369 by xurizaemon: Preserve ?render=media-popup
 when clicking "Edit image" from popup

---
 .../media_wysiwyg/includes/media_wysiwyg.pages.inc   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/media_wysiwyg/includes/media_wysiwyg.pages.inc b/modules/media_wysiwyg/includes/media_wysiwyg.pages.inc
index 1c919dd7..c126058a 100644
--- a/modules/media_wysiwyg/includes/media_wysiwyg.pages.inc
+++ b/modules/media_wysiwyg/includes/media_wysiwyg.pages.inc
@@ -175,9 +175,19 @@ function media_wysiwyg_format_form_view_mode(&$form, $form_state, $file) {
     $view_mode = variable_get('media_wysiwyg_wysiwyg_default_view_mode', 'full');
   }
 
+  $link_options = array(
+    'attributes' => array(
+      'class' => 'button',
+      'title' => t('Use for replace fox or edit file fields.'),
+    ),
+  );
+  if (!empty($_GET['render'])) {
+    $link_options['query']['render'] = $_GET['render'];
+  }
+
   $form['preview'] = array();
   $form['preview']['#prefix'] = '<div class="media-preview-group"><div class="media-item"><div class="media-thumbnail">';
-  $form['preview']['#suffix'] = '</div><div class="label-wrapper"><label class="media-filename">' . check_plain($file->filename) . '</label></div></div><div class="edit-file-link">' . l(t('Edit file'), 'file/' . $file->fid . '/edit', array('attributes' => array('class' => 'button', 'title' => t('Use for replace file or edit file fields.')))) . '</div></div>';
+  $form['preview']['#suffix'] = '</div><div class="label-wrapper"><label class="media-filename">' . check_plain($file->filename) . '</label></div></div><div class="edit-file-link">' . l(t('Edit file'), 'file/' . $file->fid . '/edit', $link_options) . '</div></div>';
   $form['preview']['thumbnail'] = file_view_file($file, $view_mode);
   $form['preview']['thumbnail']['#prefix'] = '<div id="media-preview">';
   $form['preview']['thumbnail']['#suffix'] = '</div>';
-- 
GitLab