diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-19 06:26:30 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-19 06:26:30 -0700 |
| commit | b773da2c3e3cfbe7c7643fd05bfc6fd0b2e3a399 (patch) | |
| tree | c4c4933cce8b90665beed1848e8460425a67c9b7 /phpBB/includes/acp/acp_users.php | |
| parent | b176b86f111a05338ed3c74026bcf19d42ec0ee3 (diff) | |
| parent | 584d49459d22ebf47239fc97ad8358a5404dacf4 (diff) | |
| download | forums-b773da2c3e3cfbe7c7643fd05bfc6fd0b2e3a399.tar forums-b773da2c3e3cfbe7c7643fd05bfc6fd0b2e3a399.tar.gz forums-b773da2c3e3cfbe7c7643fd05bfc6fd0b2e3a399.tar.bz2 forums-b773da2c3e3cfbe7c7643fd05bfc6fd0b2e3a399.tar.xz forums-b773da2c3e3cfbe7c7643fd05bfc6fd0b2e3a399.zip | |
Merge pull request #877 from Drae/feature/pagination-as-list
[feature/pagination-as-list] Render pagination within the template
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 17687b05c7..1f827d00aa 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1120,10 +1120,12 @@ class acp_users $log_count = 0; $start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort); + $base_url = $this->u_action . "&u=$user_id&$u_sort_param"; + phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $log_count, $config['topics_per_page'], $start); + $template->assign_vars(array( 'S_FEEDBACK' => true, - 'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&u=$user_id&$u_sort_param", $log_count, $config['topics_per_page'], $start, true), + 'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start), 'S_LIMIT_DAYS' => $s_limit_days, 'S_SORT_KEY' => $s_sort_key, @@ -2035,14 +2037,15 @@ class acp_users } $db->sql_freeresult($result); + $base_url = $this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir"; + phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $num_attachments, $config['topics_per_page'], $start); + $template->assign_vars(array( 'S_ATTACHMENTS' => true, - 'S_ON_PAGE' => on_page($num_attachments, $config['topics_per_page'], $start), + 'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $num_attachments, $config['topics_per_page'], $start), 'S_SORT_KEY' => $s_sort_key, 'S_SORT_DIR' => $s_sort_dir, - - 'PAGINATION' => generate_pagination($this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir", $num_attachments, $config['topics_per_page'], $start, true)) - ); + )); break; |