diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 11:04:49 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 15:10:40 +0200 |
| commit | fb77b6b70cb0fde351209593ea5897b2fd2e5174 (patch) | |
| tree | 7cfb27033ffbd1ae406a6504513cea0266d53831 | |
| parent | 9836efc13c73ddf2382a40cb8ce5a4181d5831ca (diff) | |
| download | forums-fb77b6b70cb0fde351209593ea5897b2fd2e5174.tar forums-fb77b6b70cb0fde351209593ea5897b2fd2e5174.tar.gz forums-fb77b6b70cb0fde351209593ea5897b2fd2e5174.tar.bz2 forums-fb77b6b70cb0fde351209593ea5897b2fd2e5174.tar.xz forums-fb77b6b70cb0fde351209593ea5897b2fd2e5174.zip | |
[feature/new-tz-handling] Fix documentation in includes/datetime.php
PHPBB3-9558
| -rw-r--r-- | phpBB/includes/datetime.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/includes/datetime.php b/phpBB/includes/datetime.php index 745c3372f1..ec2cb3f471 100644 --- a/phpBB/includes/datetime.php +++ b/phpBB/includes/datetime.php @@ -2,9 +2,8 @@ /** * * @package phpBB3 -* @version $Id$ -* @copyright (c) 2010 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 */ /** @@ -84,10 +83,12 @@ 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 + /** + * 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'])) { return $this->user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60))); |