From 9f95d03e3fc4259246af88faf9d521dc02627d89 Mon Sep 17 00:00:00 2001
From: gribnif <gribnif@56892.no-reply.drupal.org>
Date: Sat, 3 Jun 2017 17:15:42 -0400
Subject: [PATCH] Issue #2879976 by Gribnif: plugins=undefined , likely get
 parameters that were already cached previously, but still show up, review
 patch

---
 media.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media.module b/media.module
index 6232c82..f008116 100644
--- a/media.module
+++ b/media.module
@@ -1229,9 +1229,9 @@ function media_set_browser_params() {
     );
     $params = array_intersect_key($params, array_flip($safe_options));
 
-    // Retrieve the security sensitive options from the cache.
+    // If the cache is present, use its values instead of the GET parameters.
     if (!empty($params['options']) && is_string($params['options']) && $options = cache_get('media_options:' . $params['options'], 'cache_form')) {
-      $params = array_merge($options->data, $params);
+      $params = $options->data;
     }
 
     // Transform text 'true' and 'false' to actual booleans.
-- 
2.24.1