<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45378] trunk: Date/Time: Bring some consistency to `the_date()` and `the_weekday_date()`:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45378">45378</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45378","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-22 21:57:29 +0000 (Wed, 22 May 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/47354">#47354</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunktestsphpunittestsdatetheDatephp">trunk/tests/phpunit/tests/date/theDate.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2019-05-22 21:47:49 UTC (rev 45377)
+++ trunk/src/wp-includes/general-template.php 2019-05-22 21:57:29 UTC (rev 45378)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2340,28 +2340,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function the_date( $d = '', $before = '', $after = '', $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $currentday, $previousday;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $the_date = '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_new_day() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $the_date = $before . get_the_date( $d ) . $after;
</span><span class="cx" style="display: block; padding: 0 10px"> $previousday = $currentday;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $echo ) {
- echo $the_date;
- } else {
- return $the_date;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $echo ) {
+ echo $the_date;
+ } else {
+ return $the_date;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2700,21 +2702,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $before Optional. Output before the date.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $after Optional. Output after the date.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function the_weekday_date( $before = '', $after = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_locale, $currentday, $previousweekday;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_locale, $currentday, $previousday;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_weekday_date = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $currentday != $previousweekday ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_new_day() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_weekday_date .= $before;
</span><span class="cx" style="display: block; padding: 0 10px"> $the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $the_weekday_date .= $after;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $previousweekday = $currentday;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $previousday = $currentday;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2726,8 +2730,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $before The HTML to output before the date.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $after The HTML to output after the date.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $the_weekday_date = apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
- echo $the_weekday_date;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsdatetheDatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/date/theDate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/theDate.php 2019-05-22 21:47:49 UTC (rev 45377)
+++ trunk/tests/phpunit/tests/date/theDate.php 2019-05-22 21:57:29 UTC (rev 45378)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,4 +81,72 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $input;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 33750
+ */
+ function test_the_date() {
+ ob_start();
+ the_date();
+ $actual = ob_get_clean();
+ $this->assertEquals( '', $actual );
+
+ $GLOBALS['post'] = self::factory()->post->create_and_get(
+ array(
+ 'post_date' => '2015-09-16 08:00:00',
+ )
+ );
+
+ ob_start();
+ $GLOBALS['currentday'] = '18.09.15';
+ $GLOBALS['previousday'] = '17.09.15';
+ the_date();
+ $this->assertEquals( 'September 16, 2015', ob_get_clean() );
+
+ ob_start();
+ $GLOBALS['currentday'] = '18.09.15';
+ $GLOBALS['previousday'] = '17.09.15';
+ the_date( 'Y' );
+ $this->assertEquals( '2015', ob_get_clean() );
+
+ ob_start();
+ $GLOBALS['currentday'] = '18.09.15';
+ $GLOBALS['previousday'] = '17.09.15';
+ the_date( 'Y', 'before ', ' after' );
+ $this->assertEquals( 'before 2015 after', ob_get_clean() );
+
+ ob_start();
+ $GLOBALS['currentday'] = '18.09.15';
+ $GLOBALS['previousday'] = '17.09.15';
+ the_date( 'Y', 'before ', ' after', false );
+ $this->assertEquals( '', ob_get_clean() );
+ }
+
+ /**
+ * @ticket 47354
+ */
+ function test_the_weekday_date() {
+ ob_start();
+ the_weekday_date();
+ $actual = ob_get_clean();
+ $this->assertEquals( '', $actual );
+
+ $GLOBALS['post'] = self::factory()->post->create_and_get(
+ array(
+ 'post_date' => '2015-09-16 08:00:00',
+ )
+ );
+
+ ob_start();
+ $GLOBALS['currentday'] = '18.09.15';
+ $GLOBALS['previousday'] = '17.09.15';
+ the_weekday_date();
+ $this->assertEquals( 'Wednesday', ob_get_clean() );
+
+ ob_start();
+ $GLOBALS['currentday'] = '18.09.15';
+ $GLOBALS['previousday'] = '17.09.15';
+ the_weekday_date( 'before ', ' after' );
+ $this->assertEquals( 'before Wednesday after', ob_get_clean() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2019-05-22 21:47:49 UTC (rev 45377)
+++ trunk/tests/phpunit/tests/functions.php 2019-05-22 21:57:29 UTC (rev 45378)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -916,46 +916,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 33750
- */
- function test_the_date() {
- ob_start();
- the_date();
- $actual = ob_get_clean();
- $this->assertEquals( '', $actual );
-
- $GLOBALS['post'] = self::factory()->post->create_and_get(
- array(
- 'post_date' => '2015-09-16 08:00:00',
- )
- );
-
- ob_start();
- $GLOBALS['currentday'] = '18.09.15';
- $GLOBALS['previousday'] = '17.09.15';
- the_date();
- $this->assertEquals( 'September 16, 2015', ob_get_clean() );
-
- ob_start();
- $GLOBALS['currentday'] = '18.09.15';
- $GLOBALS['previousday'] = '17.09.15';
- the_date( 'Y' );
- $this->assertEquals( '2015', ob_get_clean() );
-
- ob_start();
- $GLOBALS['currentday'] = '18.09.15';
- $GLOBALS['previousday'] = '17.09.15';
- the_date( 'Y', 'before ', ' after' );
- $this->assertEquals( 'before 2015 after', ob_get_clean() );
-
- ob_start();
- $GLOBALS['currentday'] = '18.09.15';
- $GLOBALS['previousday'] = '17.09.15';
- the_date( 'Y', 'before ', ' after', false );
- $this->assertEquals( '', ob_get_clean() );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36054
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider datetime_provider
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>