diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-18 16:52:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-18 16:52:52 +0200 |
| commit | a71e60cdbd3e47c62a565dd777a28aec6832fb88 (patch) | |
| tree | 5917a09f5a91dcbc2eb2cb80cb7e487c287e477d /phpBB/includes/functions_user.php | |
| parent | 515e1662a900526342b595692d73372f4fb7bbf9 (diff) | |
| download | forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar.gz forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar.bz2 forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar.xz forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.zip | |
[feature/new-tz-handling] Rename $user->tz back to $user->timezone
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 27f4b60189..9bc72cbaa6 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -679,7 +679,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas $ban_end = max($current_time, $user->create_datetime() ->setDate((int) $ban_other[0], (int) $ban_other[1], (int) $ban_other[2]) ->setTime(0, 0, 0) - ->getTimestamp() + $user->tz->getOffset(new DateTime('UTC'))); + ->getTimestamp() + $user->timezone->getOffset(new DateTime('UTC'))); } else { |