summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2003-06-26 19:26:27 +0000
committerDries Buytaert <dries@buytaert.net>2003-06-26 19:26:27 +0000
commitf7a6c42ebaf8fe6c8421adb23aaac063391c7fc1 (patch)
tree58863de1f0f48aeb61df008ee2fffb9bb510ee8b /includes
parent1758fe779fca559faf255e5e5c9816e67fecb677 (diff)
downloadbrdo-f7a6c42ebaf8fe6c8421adb23aaac063391c7fc1.tar.gz
brdo-f7a6c42ebaf8fe6c8421adb23aaac063391c7fc1.tar.bz2
- Bugfix: do not escpae slashes in block path. Patch #50 by Gerhard.
(This accompanies the recent block module documentation update, right?)
Diffstat (limited to 'includes')
-rw-r--r--includes/theme.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 6566ed81f..05880fbd8 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -192,7 +192,7 @@ function theme_blocks($region) {
$result = db_query("SELECT * FROM blocks WHERE (status = '1' OR custom = '1') ". ($region != "all" ? "AND region = %d " : "") ."ORDER BY weight, module", $region == "left" ? 0 : 1);
while ($result && ($block = db_fetch_object($result))) {
- if ((($block->status && (!$user->uid || !$block->custom)) || ($block->custom && $user->block[$block->module][$block->delta])) && (!$block->path || preg_match(str_replace('/', '\/', $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())))) {
$block_data = module_invoke($block->module, "block", "view", $block->delta);
if ($block_data["content"]) {
theme("block", $block_data["subject"], $block_data["content"], $region);