From 1171cd2846bf111cb60d1aeef750107f7d0b50a2 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 26 Jan 2006 08:59:00 +0000
Subject: - Patch #46366 by rkell: fixed infinite loop problem with 404 and 403
 handlers.

---
 includes/common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 151135eb9..6c195b8e0 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -258,7 +258,7 @@ function drupal_not_found() {
 
   $path = drupal_get_normal_path(variable_get('site_404', ''));
   $status = MENU_NOT_FOUND;
-  if ($path) {
+  if ($path && $path != $_GET['q']) {
     menu_set_active_item($path);
     $return = menu_execute_active_handler();
   }
@@ -278,7 +278,7 @@ function drupal_access_denied() {
 
   $path = drupal_get_normal_path(variable_get('site_403', ''));
   $status = MENU_NOT_FOUND;
-  if ($path) {
+  if ($path && $path != $_GET['q']) {
     menu_set_active_item($path);
     $return = menu_execute_active_handler();
   }
-- 
cgit v1.2.3