diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-08-19 10:56:34 -0500 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-08-19 10:56:34 -0500 |
| commit | 3eb01d50cb2aeef34d02bca789d5db4b1fb50926 (patch) | |
| tree | 2cb0f7e09107e44dc7336e68c1b7523bdb349942 /phpBB/includes/functions_user.php | |
| parent | f0aaecd6cc5f530b70d31a69b8d7305c98121d12 (diff) | |
| parent | aca0e024faeca67ba5927b9f9ec495d5f687850d (diff) | |
| download | forums-3eb01d50cb2aeef34d02bca789d5db4b1fb50926.tar forums-3eb01d50cb2aeef34d02bca789d5db4b1fb50926.tar.gz forums-3eb01d50cb2aeef34d02bca789d5db4b1fb50926.tar.bz2 forums-3eb01d50cb2aeef34d02bca789d5db4b1fb50926.tar.xz forums-3eb01d50cb2aeef34d02bca789d5db4b1fb50926.zip | |
Merge branch 'ticket/bantu/9702' into develop-olympus
* ticket/bantu/9702:
[ticket/9702] Take user's timezone settings into account when banning Until ->
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index d5ec720b4b..d3594196b7 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -766,7 +766,8 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) && (strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2)) { - $ban_end = max($current_time, gmmktime(0, 0, 0, (int)$ban_other[1], (int)$ban_other[2], (int)$ban_other[0])); + $time_offset = (isset($user->timezone) && isset($user->dst)) ? (int) $user->timezone + (int) $user->dst : 0; + $ban_end = max($current_time, gmmktime(0, 0, 0, (int)$ban_other[1], (int)$ban_other[2], (int)$ban_other[0]) - $time_offset); } else { |