diff --git a/js/media.popups.js b/js/media.popups.js index 974e1b60ca2db5502d9e28f87abad64e35863eee..c7a9af527ed57487f8e0715d4976da8e86b5adc2 100644 --- a/js/media.popups.js +++ b/js/media.popups.js @@ -111,7 +111,7 @@ Drupal.media.popups.mediaBrowser.getDefaults = function () { return { global: { types: [], // Types to allow, defaults to all. - activePlugins: [] // If provided, a list of plugins which should be enabled. + enabledPlugins: [] // If provided, a list of plugins which should be enabled. }, widget: { // Settings for the actual iFrame which is launched. src: Drupal.settings.media.browserUrl, // Src of the media browser (if you want to totally override it) diff --git a/media.module b/media.module index ba986a32c5600a86c45cd4d0bb7f06e1977604f3..27acd99ddcfed5b938323b3707dd71da2c1b6356 100644 --- a/media.module +++ b/media.module @@ -1217,7 +1217,7 @@ function media_set_browser_params() { // Filter out everything except a whitelist of known safe options. $safe_options = array( - 'activePlugins', + 'enabledPlugins', 'fid', 'id', 'multiselect',