summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-11-12 22:12:12 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-11-12 22:12:12 +0000
commit2c912063bf70e2ac4fcb38d6cf452d2bf3a6b141 (patch)
tree3ddc0d1657c5a5ae787e06258816a42f2fd31a90 /includes
parentc856eac1357f131309ad4563958a8a8d048a5baf (diff)
downloadbrdo-2c912063bf70e2ac4fcb38d6cf452d2bf3a6b141.tar.gz
brdo-2c912063bf70e2ac4fcb38d6cf452d2bf3a6b141.tar.bz2
#84754: fix 404 and 403 error pages if the path set for these error pages does not exist
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc
index a60598f97..c9f577c1b 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -352,9 +352,9 @@ function drupal_not_found() {
$return = menu_execute_active_handler($path);
}
- if (empty($return)) {
+ if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
drupal_set_title(t('Page not found'));
- $return = '';
+ $return = t('The requested page could not be found.');
}
// To conserve CPU and bandwidth, omit the blocks.
@@ -381,7 +381,7 @@ function drupal_access_denied() {
$return = menu_execute_active_handler($path);
}
- if (empty($return)) {
+ if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
drupal_set_title(t('Access denied'));
$return = t('You are not authorized to access this page.');
}