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_logs.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_logs.php')
| -rw-r--r-- | phpBB/includes/acp/acp_logs.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 90c1a10649..065a6d1c22 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -128,12 +128,12 @@ class acp_logs // Grab log data $log_data = array(); $log_count = 0; - view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords); + $start = view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords); $template->assign_vars(array( 'L_TITLE' => $l_title, 'L_EXPLAIN' => $l_title_explain, - 'U_ACTION' => $this->u_action, + 'U_ACTION' => $this->u_action . "&$u_sort_param$keywords_param&start=$start", 'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start), 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true), |