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

Issue #1999448 by chertzog, aaronott, chrisjlee, daffodil_naveen, kim.pepper: Use Symfony Request for user module.

8.0.x
Dries 2013-08-13 14:59:28 -04:00
parent a567be3ee0
commit c8dec31b3e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/user/lib/Drupal/user/AccountFormController.php
View File

@ -70,7 +70,8 @@ abstract class AccountFormController extends EntityFormControllerNG {
// To skip the current password field, the user must have logged in via a
// one-time link and have the token in the URL.
$pass_reset = isset($_SESSION['pass_reset_' . $account->id()]) && isset($_GET['pass-reset-token']) && ($_GET['pass-reset-token'] == $_SESSION['pass_reset_' . $account->id()]);
$pass_reset = isset($_SESSION['pass_reset_' . $account->id()]) && (\Drupal::request()->query->get('pass-reset-token') == $_SESSION['pass_reset_' . $account->id()]);
$protected_values = array();
$current_pass_description = '';

5
core/modules/user/user.pages.inc
View File

@ -123,9 +123,10 @@ function template_preprocess_user(&$variables) {
*/
function user_edit_cancel_submit($form, &$form_state) {
$destination = array();
if (isset($_GET['destination'])) {
$query = Drupal::request()->query;
if ($query->has('destination')) {
$destination = drupal_get_destination();
unset($_GET['destination']);
$query->remove('destination');
}
// Note: We redirect from user/uid/edit to user/uid/cancel to make the tabs disappear.
$account = $form_state['controller']->getEntity();