aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/datetime.php15
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)));