diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 21:00:14 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 21:00:14 -0400 |
| commit | 6f851d89aaade2f89fe81c6c046a06eadddf2a31 (patch) | |
| tree | 7b087035a314fcaed80319e6b88e99139ea776d8 /phpBB/includes/acp/acp_inactive.php | |
| parent | b876a1ff2063f1bcc88d35500643b0ec78ba9beb (diff) | |
| parent | 83f955a2c5d7cae354a2844a16d32b17d3781afe (diff) | |
| download | forums-6f851d89aaade2f89fe81c6c046a06eadddf2a31.tar forums-6f851d89aaade2f89fe81c6c046a06eadddf2a31.tar.gz forums-6f851d89aaade2f89fe81c6c046a06eadddf2a31.tar.bz2 forums-6f851d89aaade2f89fe81c6c046a06eadddf2a31.tar.xz forums-6f851d89aaade2f89fe81c6c046a06eadddf2a31.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/5506] Do not display an empty last page after deleting logs.
Diffstat (limited to 'phpBB/includes/acp/acp_inactive.php')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index e4fb695a11..0e4801f630 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -301,7 +301,7 @@ class acp_inactive 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param&users_per_page=$per_page", $inactive_count, $per_page, $start, true), 'USERS_PER_PAGE' => $per_page, - 'U_ACTION' => $this->u_action . '&start=' . $start, + 'U_ACTION' => $this->u_action . "&$u_sort_param&users_per_page=$per_page&start=$start", )); $this->tpl_name = 'acp_inactive'; |