mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/avatars

Browse Source 
* develop: (201 commits)
  [feature/new-tz-handling] Don't use global user but make it a parameter
  [feature/new-tz-handling] Fix size of suggestion button in chrome
  [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
  [feature/new-tz-handling] Add previous selected value to validation if valid
  [feature/new-tz-handling] Display suggestion when a different value is selected
  [ticket/10998] Add border-radius to forum rules block - prosilver
  [feature/new-tz-handling] Remove additional marking of selected items
  [feature/new-tz-handling] Move update helper function to new class
  [feature/new-tz-handling] Fix unit test
  [feature/new-tz-handling] Delete old variable which is not used anymore
  [feature/new-tz-handling] Rename $user->tz back to $user->timezone
  [feature/pagination-as-list] New parameter for name of start var
  [feature/pagination-as-list] Updates for nils comments
  [feature/pagination-as-list] Rename and deprecate functions
  [feature/pagination-as-list] Various fixes and improvements
  [ticket/10968] Render pagination within the template
  [feature/new-tz-handling] Remove "timezone might be numeric"
  [feature/new-tz-handling] Add function to update the timezone
  [feature/new-tz-handling] Correctly update user and board timezones on update
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
  ...
This commit is contained in:
Igor Wiedler
2012-07-21 00:37:48 +02:00
parent df16bd1c49 841ea0e494
commit 0e2a30a27b
179 changed files with 3781 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/mcp/mcp_warn.php
View File

@@ -175,6 +175,9 @@ class mcp_warn
));
}
$base_url = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=warn&mode=list&st=$st&sk=$sk&sd=$sd");
phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $user_count, $config['topics_per_page'], $start);
$template->assign_vars(array(
'U_POST_ACTION' => $this->u_action,
'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false,
@@ -182,8 +185,7 @@ class mcp_warn
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
'PAGE_NUMBER' => on_page($user_count, $config['topics_per_page'], $start),
'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}mcp.$phpEx", "i=warn&mode=list&st=$st&sk=$sk&sd=$sd"), $user_count, $config['topics_per_page'], $start),
'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $user_count, $config['topics_per_page'], $start),
'TOTAL_USERS' => $user->lang('LIST_USERS', (int) $user_count),
));
}