diff --git a/webform.module b/webform.module index 5c49209..e841ca1 100644 --- a/webform.module +++ b/webform.module @@ -3559,19 +3559,10 @@ function webform_replace_tokens($string, $node = NULL, $submission = NULL, $emai * @param $submission * If replacing submission-level tokens, the submission for which tokens will * be created. - * @param $email - * If replacing tokens within the context of an e-mail, the Webform e-mail - * settings array. - * @param $sanitize - * Boolean value indicating if the results will be displayed as HTML output. - * This will be passed to token_replace(). If FALSE, the contents returned - * will be unsanitized. This will also result in all Webform submission tokens - * being returned as plain-text, without HTML markup, in preparation for - * e-mailing or other text-only purposes (default values, etc.) * @return string * The parsed and url encoded URL */ -function webform_replace_query_string_tokens($redirect_url, $node = NULL, $submission = NULL, $email = NULL, $sanitize = FALSE) { +function webform_replace_query_string_tokens($redirect_url, $node = NULL, $submission = NULL) { $token_data = array(); if ($node) { $token_data['node'] = $node; @@ -3579,14 +3570,11 @@ function webform_replace_query_string_tokens($redirect_url, $node = NULL, $submi if ($submission) { $token_data['webform-submission'] = $submission; } - if ($email) { - $token_data['webform-email'] = $email; - } $parsed_redirect_url = drupal_parse_url($redirect_url); if (!empty($parsed_redirect_url['query'])) { foreach ($parsed_redirect_url['query'] as $key => $value) { - $parsed_redirect_url['query'][$key] = token_replace($value, $token_data, array('clear' => true, 'sanitize' => $sanitize)); + $parsed_redirect_url['query'][$key] = token_replace($value, $token_data, array('clear' => true, 'sanitize' => FALSE)); } $redirect_url = url($parsed_redirect_url['path'], $parsed_redirect_url); }