Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2380143 by Lendude, pwolanin: Contact forms set an incorrect name and e-mail address on the global user object after the form is submitted.

merge-requests/26/head
David Rothstein 2014-11-24 19:18:35 -05:00
parent 84092f3d05
commit de8762b201
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.txt
View File

@ -1,6 +1,9 @@
Drupal 7.35, xxxx-xx-xx (development version) Drupal 7.35, xxxx-xx-xx (development version)
----------------------- -----------------------
- Fixed a bug in the Contact module which caused the global user object to have
the incorrect name and e-mail address during the remainder of the page
request after the contact form is submitted.
Drupal 7.34, 2014-11-19 Drupal 7.34, 2014-11-19
---------------------- ----------------------

4
modules/contact/contact.pages.inc
View File

@ -134,7 +134,7 @@ function contact_site_form_submit($form, &$form_state) {
global $user, $language; global $user, $language;
$values = $form_state['values']; $values = $form_state['values'];
$values['sender'] = $user; $values['sender'] = clone $user;
$values['sender']->name = $values['name']; $values['sender']->name = $values['name'];
$values['sender']->mail = $values['mail']; $values['sender']->mail = $values['mail'];
$values['category'] = contact_load($values['cid']); $values['category'] = contact_load($values['cid']);
@ -270,7 +270,7 @@ function contact_personal_form_submit($form, &$form_state) {
global $user, $language; global $user, $language;
$values = $form_state['values']; $values = $form_state['values'];
$values['sender'] = $user; $values['sender'] = clone $user;
$values['sender']->name = $values['name']; $values['sender']->name = $values['name'];
$values['sender']->mail = $values['mail']; $values['sender']->mail = $values['mail'];