diff --git a/plugins/context_reaction_block.inc b/plugins/context_reaction_block.inc index ea54b25f3130248aa4f8c85d8096f66342436b6e..46db122b0c432c87075ed24dfe2e0c0f508c7a39 100644 --- a/plugins/context_reaction_block.inc +++ b/plugins/context_reaction_block.inc @@ -330,9 +330,16 @@ class context_reaction_block extends context_reaction { static $block_info; if (!isset($block_info) || $reset) { - // We don't retrieve the block info cache when on admin pages as a + $block_info = array(); + + // Force a reset of the block info cache when on admin pages as a // variety of administrative UI tasks can create or alter block info. - $block_info = $reset || arg(0) === 'admin' ? array() : context_cache_get('block_info'); + if (arg(0) === 'admin') { + context_cache_set('block_info', NULL); + } + else if (!$reset) { + $block_info = context_cache_get('block_info'); + } if (empty($block_info)) { $block_info = array(); foreach (module_implements('block') as $module) {