diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-01-26 08:59:00 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-01-26 08:59:00 +0000 |
| commit | 1171cd2846bf111cb60d1aeef750107f7d0b50a2 (patch) | |
| tree | 74e3844c521e235c50cfac2b7bc92683bda4a2ff /includes | |
| parent | 6996292d522b4fda3aba99e2c2dec424439cb833 (diff) | |
| download | brdo-1171cd2846bf111cb60d1aeef750107f7d0b50a2.tar.gz brdo-1171cd2846bf111cb60d1aeef750107f7d0b50a2.tar.bz2 | |
- Patch #46366 by rkell: fixed infinite loop problem with 404 and 403 handlers.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |