Commit 1171cd28 authored by Dries's avatar Dries

- Patch #46366 by rkell: fixed infinite loop problem with 404 and 403 handlers.

parent 6996292d
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment