summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkenianbei2017-06-28 12:41:59 (GMT)
committerolstjos2017-06-28 12:41:59 (GMT)
commite3a0fa5366f4f9b255239a8add9d13d430af8469 (patch)
tree3ce24968e3649e710ea24e9deb140c67325ee0e0
parent0174509cdf31abcd38503b1cfe1ffa93b43ccd88 (diff)
Issue #2889764 by kenianbei, prafull.addweb: Typo: activePlugins used instead of enabledPlugins
-rw-r--r--js/media.popups.js2
-rw-r--r--media.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/media.popups.js b/js/media.popups.js
index 974e1b6..c7a9af5 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 ba986a3..27acd99 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',