Ticket #35655: 35655.diff

src/wp-includes/formatting.php

@@ -3620 +3620 @@
 
         $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;

tests/phpunit/tests/formatting/HumanTimeDiff.php

@@ -19 +19 @@
         // Data for test_human_time_diff.
         function data_test_human_time_diff() {
                 return array(
+                        array(
+                                '37 seconds',
+                                new DateTime( '2016-01-01 12:00:37' ),
+                                'Test a difference of 37 seconds.',
+                        ),
                         array(
                                 '5 mins',
                                 new DateTime( '2016-01-01 12:05:00' ),