Changeset 45378 for trunk/src/wp-includes/general-template.php

Timestamp:

05/22/2019 09:57:29 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Bring some consistency to the_date() and the_weekday_date():

• Make the_date() always apply the the filter and return a value.
• Use is_new_day() in the_weekday_date().
• Add a unit test for the_weekday_date().

Fixes #47354.

File:

• trunk/src/wp-includes/general-template.php (modified) (4 diffs)

trunk/src/wp-includes/general-template.php

@@ -2341 +2341 @@
     global $currentday, $previousday;
 
+    $the_date = '';
+
     if ( is_new_day() ) {
         $the_date    = $before . get_the_date( $d ) . $after;
         $previousday = $currentday;
-
-        /**
-         * Filters the date a post was published for display.
-         *
-         * @since 0.71
-         *
-         * @param string $the_date The formatted date string.
-         * @param string $d        PHP date format. Defaults to 'date_format' option
-         *                         if not specified.
-         * @param string $before   HTML output before the date.
-         * @param string $after    HTML output after the date.
-         */
-        $the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
-
-        if ( $echo ) {
-            echo $the_date;
-        } else {
-            return $the_date;
-        }
+    }
+
+    /**
+     * Filters the date a post was published for display.
+     *
+     * @since 0.71
+     *
+     * @param string $the_date The formatted date string.
+     * @param string $d        PHP date format. Defaults to 'date_format' option
+     *                         if not specified.
+     * @param string $before   HTML output before the date.
+     * @param string $after    HTML output after the date.
+     */
+    $the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
+
+    if ( $echo ) {
+        echo $the_date;
+    } else {
+        return $the_date;
     }
 }
@@ -2701 +2703 @@
  * @since 0.71
  *
- * @global WP_Locale $wp_locale       The WordPress date and time locale object.
- * @global string    $currentday      The day of the current post in the loop.
- * @global string    $previousweekday The day of the previous post in the loop.
+ * @global WP_Locale $wp_locale   The WordPress date and time locale object.
+ * @global string    $currentday  The day of the current post in the loop.
+ * @global string    $previousday The day of the previous post in the loop.
  *
  * @param string $before Optional. Output before the date.
@@ -2709 +2711 @@
  */
 function the_weekday_date( $before = '', $after = '' ) {
-    global $wp_locale, $currentday, $previousweekday;
+    global $wp_locale, $currentday, $previousday;
+
     $the_weekday_date = '';
-    if ( $currentday != $previousweekday ) {
+
+    if ( is_new_day() ) {
         $the_weekday_date .= $before;
         $the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
         $the_weekday_date .= $after;
-        $previousweekday   = $currentday;
+        $previousday       = $currentday;
     }
 
@@ -2727 +2731 @@
      * @param string $after            The HTML to output after the date.
      */
-    $the_weekday_date = apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
-    echo $the_weekday_date;
+    echo apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
 }