diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-03-21 16:30:01 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-03-21 16:30:01 +0000 |
| commit | 628715e4d9a0b33229c520fd2f31d83842b6c0fb (patch) | |
| tree | d4d53d81b160730e8314de1926956e94c5017831 | |
| parent | 2043b336af8598187e96b25593ae72763ed66dc3 (diff) | |
| download | brdo-628715e4d9a0b33229c520fd2f31d83842b6c0fb.tar.gz brdo-628715e4d9a0b33229c520fd2f31d83842b6c0fb.tar.bz2 | |
- Patch #6543 by Michelangelo: block path matching breaks when clean URLs are disabled.
| -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 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 |