From d95499bf03c65f59190687882567c80a074c711a Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 13 Jun 2003 17:34:18 +0000 Subject: - Bugfix: small Xtemplate fixes. Patch by Ax. (Slightly modified.) - Bugfix: block patch fix. Patch by Gerhard. - Bugfix: fixed broken URL in ping. Patch by Gerhard. (This should fix the problems shown on http://www.blo.gs/info.php?id=1515.) - Improvement: added better password generator. Patch #1 by Al. Fixes bug #1935. - Improvement: performance improvement to the blog module. Patch by Marco. --- 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 2e60b37a3..66ea4a4ac 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) .'/', request_uri()))) { + 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())))) { $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