From f7a6c42ebaf8fe6c8421adb23aaac063391c7fc1 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 26 Jun 2003 19:26:27 +0000 Subject: - Bugfix: do not escpae slashes in block path. Patch #50 by Gerhard. (This accompanies the recent block module documentation update, right?) --- includes/theme.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes') 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); -- cgit v1.2.3