Skip to content

GitLab

D
drupal
Commit 628715e4 authored by Dries's avatar Dries
Browse files
Options

- Patch #6543 by Michelangelo: block path matching breaks when clean URLs are disabled.

parent 2043b336
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/block.module
View file @ 628715e4
......@@ -366,7 +366,7 @@ function block_list($region) {
if ($block['custom'] && $user->uid && !isset($user->block[$block['module']][$block['delta']])) {
$user->block[$block['module']][$block['delta']] = $block['status'];
}
if ((($block['status'] && (!$user->uid || !$block['custom'])) || ($block['custom'] && $user->block[$block['module']][$block['delta']])) && (!$block['path'] || preg_match($block['path'], str_replace('?q=', '/', request_uri())))) {
if ((($block['status'] && (!$user->uid || !$block['custom'])) || ($block['custom'] && $user->block[$block['module']][$block['delta']])) && (!$block['path'] || preg_match($block['path'], str_replace('/?q=', '/', request_uri())))) {
/*
** Check the current throttle status and see if block should be displayed
......
modules/block/block.module
View file @ 628715e4
......@@ -366,7 +366,7 @@ function block_list($region) {
if ($block['custom'] && $user->uid && !isset($user->block[$block['module']][$block['delta']])) {
$user->block[$block['module']][$block['delta']] = $block['status'];
}
if ((($block['status'] && (!$user->uid || !$block['custom'])) || ($block['custom'] && $user->block[$block['module']][$block['delta']])) && (!$block['path'] || preg_match($block['path'], str_replace('?q=', '/', request_uri())))) {
if ((($block['status'] && (!$user->uid || !$block['custom'])) || ($block['custom'] && $user->block[$block['module']][$block['delta']])) && (!$block['path'] || preg_match($block['path'], str_replace('/?q=', '/', request_uri())))) {
/*
** Check the current throttle status and see if block should be displayed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment