From ce81be0c8c50b6939ee45d3860a0d190381068b2 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 8 Mar 2009 05:16:20 +0000 Subject: #292565 by John Morahan and lyricnz: Fix 404 on search form from a 404 page (with tests). --- includes/form.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'includes') diff --git a/includes/form.inc b/includes/form.inc index 5e911ed63..159653509 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -629,6 +629,12 @@ 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); } -- cgit v1.2.3