Changeset 45379

Timestamp:

05/23/2019 12:37:56 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Return early from the_weekday() and the_weekday_date() if we're not in the loop.

Restore $previousweekday global usage in the_weekday_date(), so it could still be used simultaneously with the_date().

Partially reverts [45378].
See #47354.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (3 diffs)
• tests/phpunit/tests/date/theDate.php (modified) (1 diff)

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

@@ -2683 +2683 @@
     global $wp_locale;
 
-    $the_weekday = $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+    $post = get_post();
+
+    if ( ! $post ) {
+        return;
+    }
+
+    $the_weekday = $wp_locale->get_weekday( get_post_time( 'w', false, $post ) );
 
     /**
@@ -2703 +2709 @@
  * @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    $previousday 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    $previousweekday The day of the previous post in the loop.
  *
  * @param string $before Optional. Output before the date.
@@ -2711 +2717 @@
  */
 function the_weekday_date( $before = '', $after = '' ) {
-    global $wp_locale, $currentday, $previousday;
+    global $wp_locale, $currentday, $previousweekday;
+
+    $post = get_post();
+
+    if ( ! $post ) {
+        return;
+    }
 
     $the_weekday_date = '';
 
-    if ( is_new_day() ) {
+    if ( $currentday !== $previousweekday ) {
         $the_weekday_date .= $before;
-        $the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+        $the_weekday_date .= $wp_locale->get_weekday( get_post_time( 'w', false, $post ) );
         $the_weekday_date .= $after;
-        $previousday       = $currentday;
+        $previousweekday   = $currentday;
     }
 

trunk/tests/phpunit/tests/date/theDate.php

@@ -139 +139 @@
 
         ob_start();
-        $GLOBALS['currentday']  = '18.09.15';
-        $GLOBALS['previousday'] = '17.09.15';
+        $GLOBALS['currentday']      = '18.09.15';
+        $GLOBALS['previousweekday'] = '17.09.15';
         the_weekday_date();
         $this->assertEquals( 'Wednesday', ob_get_clean() );
 
         ob_start();
-        $GLOBALS['currentday']  = '18.09.15';
-        $GLOBALS['previousday'] = '17.09.15';
+        $GLOBALS['currentday']      = '18.09.15';
+        $GLOBALS['previousweekday'] = '17.09.15';
         the_weekday_date( 'before ', ' after' );
         $this->assertEquals( 'before Wednesday after', ob_get_clean() );