diff --git a/media.module b/media.module index 033c37f..e1f3602 100644 --- a/media.module +++ b/media.module @@ -1330,6 +1330,9 @@ function media_load_all_exports($module, $directory, $extension, $name = NULL) { /** * Returns metadata describing Media browser plugins. * + * @return + * An associative array of plugin information, keyed by plugin. + * * @see hook_media_browser_plugin_info() * @see hook_media_browser_plugin_info_alter() */ @@ -1337,15 +1340,8 @@ function media_get_browser_plugin_info() { $info = &drupal_static(__FUNCTION__); if (!isset($info)) { - $cid = 'media:browser:plugin:info:' . $GLOBALS['language']->language; - if ($cache = cache_get($cid)) { - $info = $cache->data; - } - else { - $info = module_invoke_all('media_browser_plugin_info'); - drupal_alter('media_browser_plugin_info', $info); - cache_set($cid, $info); - } + $info = module_invoke_all('media_browser_plugin_info'); + drupal_alter('media_browser_plugin_info', $info); } return $info; diff --git a/tests/media.test b/tests/media.test index 83296d8..3594aaf 100644 --- a/tests/media.test +++ b/tests/media.test @@ -499,10 +499,6 @@ class MediaHooksTestCase extends MediaFileFieldTestCase { // implementation and ensure it is working as designed. variable_set('media_module_test_media_browser_plugin_info_alter', TRUE); - // Clear the media browser plugin info cache so the alter is picked up. - $cid = 'media:browser:plugin:info:' . $GLOBALS['language']->language; - cache_clear_all($cid, 'cache'); - $this->drupalGet('media/browser'); $this->assertRaw(t('Altered plugin title'), 'Custom browser plugin was successfully altered.');