summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2013-12-29 15:32:28 -0500
committerDavid Rothstein <drothstein@gmail.com>2013-12-29 15:32:28 -0500
commit257fac8454924bb2f09aaee6a112f9f86f7520f1 (patch)
tree7c0bc3b7730b203fba3c1ef0ce491cf5b2525315 /modules/user
parent987892b79edcb3b2325fe551f261cd627c1f0e99 (diff)
downloadbrdo-257fac8454924bb2f09aaee6a112f9f86f7520f1.tar.gz
brdo-257fac8454924bb2f09aaee6a112f9f86f7520f1.tar.bz2
Issue #1426122 by deletedaccount, Alan D., andypost, maximpodorov: Some callbacks return junk when calling drupal_not_found(); replace with return MENU_NOT_FOUND instead.
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.pages.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index d72cecc26..7d40663e7 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -159,6 +159,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
// Deny access, no more clues.
// Everything will be in the watchdog's URL for the administrator to check.
drupal_access_denied();
+ drupal_exit();
}
}
}
@@ -534,7 +535,7 @@ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') {
drupal_goto("user/$account->uid/cancel");
}
}
- drupal_access_denied();
+ return MENU_ACCESS_DENIED;
}
/**