2 files changed, 91 insertions, 20 deletions
diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php
index e674707883..63cdba90fd 100644
--- a/phpBB/phpbb/datetime.php
+++ b/phpBB/phpbb/datetime.php
@@ -91,25 +91,28 @@ class datetime extends \DateTime
 
 				$midnight	= $midnight->getTimestamp();
 
-				$day = false;
-
-				if ($timestamp > $midnight + 86400)
-				{
-					$day = 'TOMORROW';
-				}
-				else if ($timestamp > $midnight)
-				{
-					$day = 'TODAY';
-				}
-				else if ($timestamp > $midnight - 86400)
-				{
-					$day = 'YESTERDAY';
-				}
-
-				if ($day !== false)
+				if ($timestamp <= $midnight + 2 * 86400)
 				{
-					// Format using the short formatting and finally swap out the relative token placeholder with the correct value
-					return str_replace(self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER, $this->user->lang['datetime'][$day], strtr(parent::format($format['format_short']), $format['lang']));
+					$day = false;
+
+					if ($timestamp > $midnight + 86400)
+					{
+						$day = 'TOMORROW';
+					}
+					else if ($timestamp > $midnight)
+					{
+						$day = 'TODAY';
+					}
+					else if ($timestamp > $midnight - 86400)
+					{
+						$day = 'YESTERDAY';
+					}
+
+					if ($day !== false)
+					{
+						// Format using the short formatting and finally swap out the relative token placeholder with the correct value
+						return str_replace(self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER, $this->user->lang['datetime'][$day], strtr(parent::format($format['format_short']), $format['lang']));
+					}
 				}
 			}
 		}
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
index 5f155adbbd..0f87abc180 100644
--- a/tests/datetime/from_format_test.php
+++ b/tests/datetime/from_format_test.php
@@ -37,8 +37,6 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
 	*/
 	public function test_from_format($timezone, $format, $expected)
 	{
-		global $user;
-
 		$user = new \phpbb\user('\phpbb\datetime');
 		$user->timezone = new DateTimeZone($timezone);
 		$user->lang['datetime'] = array(
@@ -55,4 +53,74 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
 		$timestamp = $user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone));
 		$this->assertEquals($expected, $user->format_date($timestamp, $format, true));
 	}
+
+
+	public function relative_format_date_data()
+	{
+		// If the current time is too close to the testing time,
+		// the relative time will use "x minutes ago" instead of "today ..."
+		// So we use 18:01 in the morning and 06:01 in the afternoon.
+		$testing_time = date('H') <= 12 ? '06:01' : '18:01';
+
+		return array(
+			array(
+				date('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, false,
+				date('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time,
+			),
+
+			array(
+				date('Y-m-d', time() + 86400) . ' ' . $testing_time, false,
+				'Tomorrow ' . $testing_time,
+			),
+			array(
+				date('Y-m-d', time() + 86400) . ' ' . $testing_time, true,
+				date('Y-m-d', time() + 86400) . ' ' . $testing_time,
+			),
+
+			array(
+				date('Y-m-d') . ' ' . $testing_time, false,
+				'Today ' . $testing_time,
+			),
+			array(
+				date('Y-m-d') . ' ' . $testing_time, true,
+				date('Y-m-d') . ' ' . $testing_time,
+			),
+
+			array(
+				date('Y-m-d', time() - 86400) . ' ' . $testing_time, false,
+				'Yesterday ' . $testing_time,
+			),
+			array(
+				date('Y-m-d', time() - 86400) . ' ' . $testing_time, true,
+				date('Y-m-d', time() - 86400) . ' ' . $testing_time,
+			),
+
+			array(
+				date('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false,
+				date('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time,
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider relative_format_date_data()
+	 */
+	public function test_relative_format_date($timestamp, $forcedate, $expected)
+	{
+		$user = new \phpbb\user('\phpbb\datetime');
+		$user->timezone = new DateTimeZone('UTC');
+		$user->lang['datetime'] = array(
+			'TODAY'		=> 'Today',
+			'TOMORROW'	=> 'Tomorrow',
+			'YESTERDAY'	=> 'Yesterday',
+			'AGO'		=> array(
+				0		=> 'less than a minute ago',
+				1		=> '%d minute ago',
+				2		=> '%d minutes ago',
+			),
+		);
+
+		$timestamp = $user->get_timestamp_from_format('Y-m-d H:i', $timestamp, new DateTimeZone('UTC'));
+		$this->assertEquals($expected, $user->format_date($timestamp, '|Y-m-d| H:i', $forcedate));
+	}
 }