diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 00:37:48 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 00:37:48 +0200 |
| commit | 0e2a30a27b92a851221be489370217b9c7bf8e07 (patch) | |
| tree | 78e6a55815d2dffbc07b101beffe17c98a8642f5 /phpBB/memberlist.php | |
| parent | df16bd1c49e6e970b147f15e752825dd3186fb87 (diff) | |
| parent | 841ea0e494504400c798faa6cc860dd1179e1004 (diff) | |
| download | forums-0e2a30a27b92a851221be489370217b9c7bf8e07.tar forums-0e2a30a27b92a851221be489370217b9c7bf8e07.tar.gz forums-0e2a30a27b92a851221be489370217b9c7bf8e07.tar.bz2 forums-0e2a30a27b92a851221be489370217b9c7bf8e07.tar.xz forums-0e2a30a27b92a851221be489370217b9c7bf8e07.zip | |
Merge branch 'develop' into feature/avatars
* 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
...
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 9864e3c621..23946d1f58 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1571,10 +1571,11 @@ switch ($mode) } } + phpbb_generate_template_pagination($template, $pagination_url, 'pagination', 'start', $total_users, $config['topics_per_page'], $start); + // Generate page $template->assign_vars(array( - 'PAGINATION' => generate_pagination($pagination_url, $total_users, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($total_users, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => phpbb_on_page($template, $user, $pagination_url, $total_users, $config['topics_per_page'], $start), 'TOTAL_USERS' => $user->lang('LIST_USERS', (int) $total_users), 'PROFILE_IMG' => $user->img('icon_user_profile', $user->lang['PROFILE']), @@ -1673,7 +1674,8 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f if ($bday_year) { - $now = phpbb_gmgetdate(time() + $user->timezone + $user->dst); + $now = $user->create_datetime(); + $now = phpbb_gmgetdate($now->getTimestamp() + $now->getOffset()); $diff = $now['mon'] - $bday_month; if ($diff == 0) |