Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '8.x' of git.drupal.org:project/drupal into 8.x

8.0.x
Jennifer Hodgdon 2012-02-29 08:57:04 -08:00
parent aedceb6950 c94c76bd2c
commit 3c78ca4705
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/modules/block/block.module
View File

@ -347,6 +347,16 @@ function block_get_blocks_by_region($region) {
function _block_get_renderable_region($list = array()) { function _block_get_renderable_region($list = array()) {
$weight = 0; $weight = 0;
$build = array(); $build = array();
// Block caching is not compatible with node_access modules. We also
// preserve the submission of forms in blocks, by fetching from cache
// only if the request method is 'GET' (or 'HEAD'). User 1 being out of
// the regular 'roles define permissions' schema, it brings too many
// chances of having unwanted output get in the cache and later be served
// to other users. We therefore exclude user 1 from block caching.
$not_cacheable = $GLOBALS['user']->uid == 1 ||
count(module_implements('node_grants')) ||
!in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD'));
foreach ($list as $key => $block) { foreach ($list as $key => $block) {
$build[$key] = array( $build[$key] = array(
'#block' => $block, '#block' => $block,
@ -354,18 +364,7 @@ function _block_get_renderable_region($list = array()) {
'#theme_wrappers' => array('block'), '#theme_wrappers' => array('block'),
); );
// Block caching is not compatible with node_access modules. We also if ($not_cacheable || in_array($block->cache, array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))) {
// preserve the submission of forms in blocks, by fetching from cache
// only if the request method is 'GET' (or 'HEAD'). User 1 being out of
// the regular 'roles define permissions' schema, it brings too many
// chances of having unwanted output get in the cache and later be served
// to other users. We therefore exclude user 1 from block caching.
if (
$GLOBALS['user']->uid == 1 ||
count(module_implements('node_grants')) ||
!in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')) ||
in_array($block->cache, array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))
) {
// Non-cached blocks get built immediately. Provides more content // Non-cached blocks get built immediately. Provides more content
// that can be easily manipulated during hook_page_alter(). // that can be easily manipulated during hook_page_alter().
$build[$key] = _block_get_renderable_block($build[$key]); $build[$key] = _block_get_renderable_block($build[$key]);