From e87e7816c8dd94446b00f0cc1c74b5a5e9f2697c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 24 Jan 2001 08:24:37 +0000
Subject: [PATCH] - fix for the "block problem" reported by martin@abol.com:
it only happened when you hosted drupal in a subdirectory a la
http://yourserver.com/drupal/
---
includes/theme.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/theme.inc b/includes/theme.inc
index bc09e15885ae..6f9785aa4b65 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -73,13 +73,13 @@ function menu($name, $module) {
function theme_blocks($region, $theme) {
global $id, $PHP_SELF, $user;
- switch (strtok($PHP_SELF, ".")) {
- case "/story":
+ switch (strrchr($PHP_SELF, "/")) {
+ case "/story.php":
if ($user->id) $story = db_fetch_object(db_query("SELECT * FROM stories WHERE id = '$id'"));
if ($story->status == 1) theme_moderation_results($theme, $story);
else theme_new_headlines($theme);
break;
- case "/index":
+ case "/index.php":
if ($user->id) $result = db_query("SELECT * FROM blocks b LEFT JOIN layout l ON b.name = l.block WHERE (b.status = 2 OR (b.status AND l.user = '$user->id'))". (($region == "left" || $region == "right") ? ($region == "left" ? " AND b.region = 0" : " AND b.region = 1") : "") ." ORDER BY weight");
else $result = db_query("SELECT * FROM blocks WHERE status = 2 ORDER BY weight");
while ($block = db_fetch_object($result)) {
--
GitLab