Commit 679e9011 authored by webchick's avatar webchick

#292565 follow-up by Jody Lynn: Remove ['destination'] hacks to get login...

#292565 follow-up by Jody Lynn: Remove ['destination'] hacks to get login redirection working again.
parent 09787420
......@@ -358,11 +358,6 @@ function drupal_not_found() {
watchdog('page not found', check_plain($_GET['q']), NULL, WATCHDOG_WARNING);
// Keep old path for reference.
if (!isset($_REQUEST['destination'])) {
$_REQUEST['destination'] = $_GET['q'];
}
$path = drupal_get_normal_path(variable_get('site_404', ''));
if ($path && $path != $_GET['q']) {
// Custom 404 handler. Set the active item in case there are tabs to
......@@ -389,13 +384,9 @@ function drupal_not_found() {
*/
function drupal_access_denied() {
drupal_set_header('403 Forbidden');
watchdog('access denied', check_plain($_GET['q']), NULL, WATCHDOG_WARNING);
// Keep old path for reference.
if (!isset($_REQUEST['destination'])) {
$_REQUEST['destination'] = $_GET['q'];
}
$path = drupal_get_normal_path(variable_get('site_403', ''));
if ($path && $path != $_GET['q']) {
// Custom 403 handler. Set the active item in case there are tabs to
......
......@@ -691,12 +691,6 @@ function drupal_redirect_form($form, $redirect = NULL) {
}
if (!isset($goto) || ($goto !== FALSE)) {
if (isset($goto)) {
// Remove any fake destination set by drupal_not_found() or
// drupal_access_denied() so that we can properly redirect from those
// pages.
if (isset($_REQUEST['destination']) && $_REQUEST['destination'] == $_GET['q']) {
unset($_REQUEST['destination']);
}
if (is_array($goto)) {
call_user_func_array('drupal_goto', $goto);
}
......
......@@ -922,6 +922,30 @@ class UserBlocksUnitTests extends DrupalWebTestCase {
);
}
/**
* Test the user login block.
*/
function testUserLoginBlock() {
// Create a user with some permission that anonymous users lack.
$user = $this->drupalCreateUser(array('administer permissions'));
// Log in using the block.
$edit = array();
$edit['name'] = $user->name;
$edit['pass'] = $user->pass_raw;
$this->drupalPost('admin/user/permissions', $edit, t('Log in'));
$this->assertText(t('Log out'), t('Logged in.'));
// Check that we are still on the same page.
$this->assertPattern('!<title.*?' . t('Permissions') . '.*?</title>!', t('Still on the same page after login for access denied page'));
// Now, log out and repeat with a non-403 page.
$this->clickLink(t('Log out'));
$this->drupalPost('filter/tips', $edit, t('Log in'));
$this->assertText(t('Log out'), t('Logged in.'));
$this->assertPattern('!<title.*?' . t('Compose tips') . '.*?</title>!', t('Still on the same page after login for allowed page'));
}
/**
* Test the Who's Online block.
*/
......
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