Projet

Général

Profil

Révision 582db59d

Ajouté par Assos Assos il y a plus de 8 ans

Update Drupal core to version 7.40

Voir les différences:

drupal7/modules/user/user.pages.inc
105 105 
      $reset_link_account = user_load($uid);
106 106 
      if (!empty($reset_link_account)) {
107 107 
        drupal_set_message(t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please <a href="!logout">logout</a> and try using the link again.',
108 
          array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout'))));
108 
          array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout'))), 'warning');
109 109 
      } else {
110 110 
        // Invalid one-time link specifies an unknown user.
111 
        drupal_set_message(t('The one-time login link you clicked is invalid.'));
111 
        drupal_set_message(t('The one-time login link you clicked is invalid.'), 'error');
112 112 
      }
113 113 
    }
114 114 
    drupal_goto();
......
123 123 
    if ($timestamp <= $current && $account = reset($users)) {
124 124 
      // No time out for first time login.
125 125 
      if ($account->login && $current - $timestamp > $timeout) {
126 
        drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
126 
        drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'error');
127 127 
        drupal_goto('user/password');
128 128 
      }
129 129 
      elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid)) {
......
151 151 
        }
152 152 
      }
153 153 
      else {
154 
        drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'));
154 
        drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'), 'error');
155 155 
        drupal_goto('user/password');
156 156 
      }
157 157 
    }
......
533 533 
      batch_process('');
534 534 
    }
535 535 
    else {
536 
      drupal_set_message(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'));
536 
      drupal_set_message(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'error');
537 537 
      drupal_goto("user/$account->uid/cancel");
538 538 
    }
539 539 
  }

Formats disponibles : Unified diff