From dd38e9cc0b334fd31143352510083c8095536a67 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 28 Jun 2019 06:44:57 +0000
Subject: [PATCH] Formatting: Add support for seconds to `human_time_diff()`.

The web has gotten so much faster since `human_time_diff()` was created, we need to be able to measure time differences with much finer granularity. Now, we can.

Props johnjamesjacoby, pento.
Fixes #35655.


Built from https://develop.svn.wordpress.org/trunk@45573


git-svn-id: http://core.svn.wordpress.org/trunk@45384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 10 +++++++++-
 wp-includes/version.php    |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 4d36452c90..335a7cbc37 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -3608,6 +3608,7 @@ function sanitize_email( $email ) {
  * "5 mins", "2 days".
  *
  * @since 1.5.0
+ * @since 5.3.0 Added support for showing a difference in seconds.
  *
  * @param int $from Unix timestamp from which the difference begins.
  * @param int $to   Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
@@ -3620,7 +3621,14 @@ function human_time_diff( $from, $to = '' ) {
 
 	$diff = (int) abs( $to - $from );
 
-	if ( $diff < HOUR_IN_SECONDS ) {
+	if ( $diff < MINUTE_IN_SECONDS ) {
+		$secs = $diff;
+		if ( $secs <= 1 ) {
+			$secs = 1;
+		}
+		/* translators: Time difference between two dates, in seconds. %s: Number of seconds */
+		$since = sprintf( _n( '%s second', '%s seconds', $secs ), $secs );
+	} elseif ( $diff < HOUR_IN_SECONDS && $diff >= MINUTE_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
 		if ( $mins <= 1 ) {
 			$mins = 1;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ee58b026a..801b0fab0b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45572';
+$wp_version = '5.3-alpha-45573';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.