diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/block.module | 2 | ||||
| -rw-r--r-- | modules/block/block.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/block.module b/modules/block.module index 9734ea587..c2a2b0d98 100644 --- a/modules/block.module +++ b/modules/block.module @@ -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'], "/" . $_GET["q"]))) { + 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 diff --git a/modules/block/block.module b/modules/block/block.module index 9734ea587..c2a2b0d98 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -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'], "/" . $_GET["q"]))) { + 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 |