Changeset 7160

Timestamp:

11/06/2020 12:22:08 AM (3 years ago)

Author:

johnjamesjacoby

Message:

Formatting: fix output of bbp_get_time_since() in some languages.

This commit changes how the "right now" fallback is calculated to avoid trimming and type-casting a translated string value, by checking the two count values (I.E. 1 year, 1 day) for emptiness - "0, 0" will now correctly fallback to "right now".

In trunk, for 2.7. Fixes #3398.

File:

• trunk/src/includes/common/formatting.php (modified) (2 diffs)

trunk/src/includes/common/formatting.php

@@ -695 +695 @@
         } else {
 
+            // Default count values
+            $count  = 0;
+            $count2 = 0;
+
             // Step one: the first chunk
             for ( $i = 0, $j = count( $chunks ); $i < $j; ++$i ) {
@@ -727 +731 @@
                 }
 
-                // No output, so happened right now
-                if ( ! (int) trim( $output ) ) {
+                // Empty counts, so fallback to right now
+                if ( empty( $count ) && empty( $count2 ) ) {
                     $output = $right_now_text;
                 }