#687666 by tstoeckler, David_Rothstein: Fixed block static cache a bit too static.

1 files changed, 9 insertions, 0 deletions

diff --git a/modules/block/block.module b/modules/block/block.module
index 3770bb277..402f43a9e 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -242,6 +242,15 @@ function block_page_build(&$page) {
         $page[$region] = $blocks;
       }
     }
+    // Once we've finished attaching all blocks to the page, clear the static
+    // cache to allow modules to alter the block list differently in different
+    // contexts. For example, any code that triggers hook_page_build() more
+    // than once in the same page request may need to alter the block list
+    // differently each time, so that only certain parts of the page are
+    // actually built. We do not clear the cache any earlier than this, though,
+    // because it is used each time block_get_blocks_by_region() gets called
+    // above.
+    drupal_static_reset('block_list');
   }
   else {
     // Append region description if we are rendering the regions demo page.