From 628715e4d9a0b33229c520fd2f31d83842b6c0fb Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 21 Mar 2004 16:30:01 +0000
Subject: - Patch #6543 by Michelangelo: block path matching breaks when clean
 URLs are disabled.

---
 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 c2a2b0d98..97fa1ee53 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'], 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
diff --git a/modules/block/block.module b/modules/block/block.module
index c2a2b0d98..97fa1ee53 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'], 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
-- 
cgit v1.2.3