diff options
| author | David Rothstein <drothstein@gmail.com> | 2015-03-18 15:23:16 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2015-03-18 15:23:16 -0400 |
| commit | c4164898def11c956348750c9b41fdbb06ddb069 (patch) | |
| tree | a04720f5b76742f87c36ff51bff40afb5844b68d /modules/statistics | |
| parent | ea85d7c8e6f1793357841d0ba8d64f01cd3f69f4 (diff) | |
| parent | b44056d2f8e8c71d35c85ec5c2fb8f7c8a02d8a8 (diff) | |
| download | brdo-c4164898def11c956348750c9b41fdbb06ddb069.tar.gz brdo-c4164898def11c956348750c9b41fdbb06ddb069.tar.bz2 | |
Merge tag '7.35' into 7.x
7.35 release
Conflicts:
CHANGELOG.txt
includes/bootstrap.inc
Diffstat (limited to 'modules/statistics')
| -rw-r--r-- | modules/statistics/statistics.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index 0498bb76b..7e038d612 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -414,7 +414,7 @@ class StatisticsAdminTestCase extends DrupalWebTestCase { $timestamp = time(); $this->drupalPost(NULL, NULL, t('Cancel account')); // Confirm account cancellation request. - $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login)); + $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid)); $this->assertFalse(user_load($account->uid, TRUE), 'User is not found in the database.'); $this->drupalGet('admin/reports/visitors'); |