diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-20 14:34:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-20 14:34:35 +0200 |
| commit | 82e195ac683f6604aee9862233ffcb4f58af64b0 (patch) | |
| tree | 908d47cf69c9f12557a7e2d21577d3395e6b1612 /phpBB/includes | |
| parent | 902a79bfdabb2c459f2385cff80b5fa38099d2f7 (diff) | |
| download | forums-82e195ac683f6604aee9862233ffcb4f58af64b0.tar forums-82e195ac683f6604aee9862233ffcb4f58af64b0.tar.gz forums-82e195ac683f6604aee9862233ffcb4f58af64b0.tar.bz2 forums-82e195ac683f6604aee9862233ffcb4f58af64b0.tar.xz forums-82e195ac683f6604aee9862233ffcb4f58af64b0.zip | |
[feature/new-tz-handling] Fix code and doc layout
PHPBB3-9558
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/datetime.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/datetime.php b/phpBB/includes/datetime.php index 00dc1958e5..317376431d 100644 --- a/phpBB/includes/datetime.php +++ b/phpBB/includes/datetime.php @@ -65,14 +65,16 @@ class phpbb_datetime extends DateTime if ($relative) { - /** + /* * Check the delta is less than or equal to 1 hour * and the delta not more than a minute in the past * and the delta is either greater than -5 seconds or timestamp * and current time are of the same minute (they must be in the same hour already) * finally check that relative dates are supported by the language pack */ - if ($delta <= 3600 && $delta > -60 && ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) && isset($this->user->lang['datetime']['AGO'])) + if ($delta <= 3600 && $delta > -60 && + ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) + && isset($this->user->lang['datetime']['AGO'])) { return $this->user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60))); } diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 53511291b5..98a08ea4d3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1111,10 +1111,12 @@ function phpbb_tz_select_compare($a, $b) if ($a_name == $b_name) { return 0; - } else if ($a_name == 'UTC') + } + else if ($a_name == 'UTC') { return -1; - } else if ($b_name == 'UTC') + } + else if ($b_name == 'UTC') { return 1; } |