From 3d5f11e004ddc4a45f38f3aee28ac27a5f9fc549 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 5 Mar 2004 20:33:02 +0000 Subject: - Restored the old block path behavior. --- modules/block.module | 2 +- modules/block/block.module | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') 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 -- cgit v1.2.3