diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-08-24 12:32:10 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-08-24 12:32:10 +0000 |
| commit | 1d34a3e3294d8d6fafeed2e73f00a37853a03a90 (patch) | |
| tree | 48e6bcde31d4c9f90e6714cd8f0883292164a248 /modules/statistics | |
| parent | 4241e34e0b3a5f987ee961c3a0813417094de7bd (diff) | |
| download | brdo-1d34a3e3294d8d6fafeed2e73f00a37853a03a90.tar.gz brdo-1d34a3e3294d8d6fafeed2e73f00a37853a03a90.tar.bz2 | |
- Patch #549432 by jromine, Gábor Hojtsy: move ip blocking settings.
Diffstat (limited to 'modules/statistics')
| -rw-r--r-- | modules/statistics/statistics.admin.inc | 2 | ||||
| -rw-r--r-- | modules/statistics/statistics.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/statistics/statistics.admin.inc b/modules/statistics/statistics.admin.inc index bbf60ccda..e33db8135 100644 --- a/modules/statistics/statistics.admin.inc +++ b/modules/statistics/statistics.admin.inc @@ -132,7 +132,7 @@ function statistics_top_visitors() { $rows = array(); foreach ($result as $account) { $qs = drupal_get_destination(); - $ban_link = $account->iid ? l(t('unblock IP address'), "admin/settings/ip-blocking/delete/$account->iid", array('query' => $qs)) : l(t('block IP address'), "admin/settings/ip-blocking/$account->hostname", array('query' => $qs)); + $ban_link = $account->iid ? l(t('unblock IP address'), "admin/config/people/ip-blocking/delete/$account->iid", array('query' => $qs)) : l(t('block IP address'), "admin/config/people/ip-blocking/$account->hostname", array('query' => $qs)); $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->uid) ? $ban_link : ''); } diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index 8056c0d1c..43a5ccbc5 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -53,7 +53,7 @@ class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase { $this->assertText(t('IP address blocking'), t('IP blocking page displayed.')); $edit = array(); $edit['ip'] = $test_ip_address; - $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save')); + $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save')); $ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField(); $this->assertNotEqual($ip, FALSE, t('IP address found in database')); $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), t('IP address was blocked.')); @@ -66,7 +66,7 @@ class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase { $this->clickLink('unblock IP address'); $this->assertRaw(t('Are you sure you want to delete %ip?', array('%ip' => $test_ip_address)), t('IP address deletion confirmation found.')); $edit = array(); - $this->drupalPost('admin/settings/ip-blocking/delete/1', NULL, t('Delete')); + $this->drupalPost('admin/config/people/ip-blocking/delete/1', NULL, t('Delete')); $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)), t('IP address deleted.')); } } |