diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-29 12:28:23 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-29 12:28:23 -0700 |
| commit | e56afba266a851fc7f9cf29edd831b7ee9a4802e (patch) | |
| tree | cee5f40ff97e6d28b0fd5057d1deef522564e910 /modules | |
| parent | 4060a322128849fcaea16b337559ece8090a459f (diff) | |
| download | brdo-e56afba266a851fc7f9cf29edd831b7ee9a4802e.tar.gz brdo-e56afba266a851fc7f9cf29edd831b7ee9a4802e.tar.bz2 | |
Issue #1011614 by catch, pillarsdotnet: Fixed Theme registry can grow too large for MySQL max_allowed_packet() and memcache default slab size.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/contextual/contextual.module | 6 | ||||
| -rw-r--r-- | modules/simpletest/tests/theme.test | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/contextual/contextual.module b/modules/contextual/contextual.module index 0d6b625e7..2716ba2f7 100644 --- a/modules/contextual/contextual.module +++ b/modules/contextual/contextual.module @@ -82,16 +82,12 @@ function contextual_element_info() { * @see contextual_pre_render_links() */ function contextual_preprocess(&$variables, $hook) { - static $hooks; - // Nothing to do here if the user is not permitted to access contextual links. if (!user_access('access contextual links')) { return; } - if (!isset($hooks)) { - $hooks = theme_get_registry(); - } + $hooks = theme_get_registry(FALSE); // Determine the primary theme function argument. if (!empty($hooks[$hook]['variables'])) { diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test index 53557e361..ea0f257dd 100644 --- a/modules/simpletest/tests/theme.test +++ b/modules/simpletest/tests/theme.test @@ -194,7 +194,7 @@ class ThemeItemListUnitTest extends DrupalWebTestCase { /** * Unit tests for theme_links(). */ -class ThemeLinksUnitTest extends DrupalUnitTestCase { +class ThemeLinksTest extends DrupalWebTestCase { public static function getInfo() { return array( 'name' => 'Links', |