<!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>[44809] trunk/src: Date/Time: Reduce explicit local `current_time( 'timestamp' )` usage in favor of native PHP functions.</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/44809">44809</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/44809","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-03-07 09:11:37 +0000 (Thu, 07 Mar 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: Reduce explicit local `current_time( 'timestamp' )` usage in favor of native PHP functions.
Timestamps don't carry any timezone information, using the intended format directly simplifies the logic and makes the code less confusing.
Props Rarst, jdgrimes.
See <a href="https://core.trac.wordpress.org/ticket/40657">#40657</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2019-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1464,7 +1464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_ID'] = $pid;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_type'] = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'draft';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $now = current_time( 'timestamp', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = time();
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Post creation date, 2: Post creation time */
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2019-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-admin/includes/dashboard.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,8 +858,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $today = date( 'Y-m-d', current_time( 'timestamp' ) );
- $tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $today = current_time( 'Y-m-d' );
+ $tomorrow = gmdate( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
+ $year = current_time( 'Y' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $posts->have_posts() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts->the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +870,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $relative = __( 'Today' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $relative = __( 'Tomorrow' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( date( 'Y', $time ) !== date( 'Y', current_time( 'timestamp' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( date( 'Y', $time ) !== $year ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: date and time format for recent posts on the dashboard, from a different calendar year, see https://secure.php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> $relative = date_i18n( __( 'M jS Y' ), $time );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2019-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-admin/includes/template.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,20 +774,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // todo: Remove this?
</span><span class="cx" style="display: block; padding: 0 10px"> // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $time_adj = current_time( 'timestamp' );
</del><span class="cx" style="display: block; padding: 0 10px"> $post_date = ( $for_post ) ? $post->post_date : get_comment()->comment_date;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $jj = ( $edit ) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
- $mm = ( $edit ) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
- $aa = ( $edit ) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
- $hh = ( $edit ) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
- $mn = ( $edit ) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
- $ss = ( $edit ) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $jj = ( $edit ) ? mysql2date( 'd', $post_date, false ) : current_time( 'd' );
+ $mm = ( $edit ) ? mysql2date( 'm', $post_date, false ) : current_time( 'm' );
+ $aa = ( $edit ) ? mysql2date( 'Y', $post_date, false ) : current_time( 'Y' );
+ $hh = ( $edit ) ? mysql2date( 'H', $post_date, false ) : current_time( 'H' );
+ $mn = ( $edit ) ? mysql2date( 'i', $post_date, false ) : current_time( 'i' );
+ $ss = ( $edit ) ? mysql2date( 's', $post_date, false ) : current_time( 's' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cur_jj = gmdate( 'd', $time_adj );
- $cur_mm = gmdate( 'm', $time_adj );
- $cur_aa = gmdate( 'Y', $time_adj );
- $cur_hh = gmdate( 'H', $time_adj );
- $cur_mn = gmdate( 'i', $time_adj );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cur_jj = current_time( 'd' );
+ $cur_mm = current_time( 'm' );
+ $cur_aa = current_time( 'Y' );
+ $cur_hh = current_time( 'H' );
+ $cur_mn = current_time( 'i' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i < 13; $i = $i + 1 ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2019-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-admin/includes/user.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1392,7 +1392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</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">- $time_diff = current_time( 'timestamp', true ) - $timestamp;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $time_diff = time() - $timestamp;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $time_diff >= 0 && $time_diff < DAY_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: human readable timestamp */
</span></span></pre></div>
<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-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-includes/general-template.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2005,7 +2005,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // week_begins = 0 stands for Sunday
</span><span class="cx" style="display: block; padding: 0 10px"> $week_begins = (int) get_option( 'start_of_week' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ts = current_time( 'timestamp' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's figure out when we are
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $monthnum ) && ! empty( $year ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2025,8 +2024,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $thismonth = zeroise( (int) substr( $m, 4, 2 ), 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thisyear = gmdate( 'Y', $ts );
- $thismonth = gmdate( 'm', $ts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thisyear = current_time( 'Y' );
+ $thismonth = current_time( 'm' );
</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"> $unixmonth = mktime( 0, 0, 0, $thismonth, 1, $thisyear );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2136,9 +2135,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $newrow = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $day == gmdate( 'j', $ts ) &&
- $thismonth == gmdate( 'm', $ts ) &&
- $thisyear == gmdate( 'Y', $ts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $day == current_time( 'j' ) &&
+ $thismonth == current_time( 'm' ) &&
+ $thisyear == current_time( 'Y' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= '<td id="today">';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= '<td>';
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2019-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-includes/link-template.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_year_link( $year ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $year ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $year = gmdate( 'Y', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $year = current_time( 'Y' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $yearlink = $wp_rewrite->get_year_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $yearlink ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,10 +505,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_month_link( $year, $month ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $year ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $year = gmdate( 'Y', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $year = current_time( 'Y' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $month ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $month = gmdate( 'm', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $month = current_time( 'm' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $monthlink = $wp_rewrite->get_month_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $monthlink ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,13 +546,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_day_link( $year, $month, $day ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $year ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $year = gmdate( 'Y', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $year = current_time( 'Y' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $month ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $month = gmdate( 'm', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $month = current_time( 'm' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $day ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $day = gmdate( 'j', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $day = current_time( 'j' );
</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"> $daylink = $wp_rewrite->get_day_permastruct();
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></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/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2019-03-07 09:08:38 UTC (rev 44808)
+++ trunk/src/wp-includes/ms-functions.php 2019-03-07 09:11:37 UTC (rev 44809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,7 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $signup != null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $registered_at = mysql2date( 'U', $signup->registered );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $now = current_time( 'timestamp', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = time();
</ins><span class="cx" style="display: block; padding: 0 10px"> $diff = $now - $registered_at;
</span><span class="cx" style="display: block; padding: 0 10px"> // If registered more than two days ago, cancel registration and let this signup go through.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diff > 2 * DAY_IN_SECONDS ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $signup != null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $diff = current_time( 'timestamp', true ) - mysql2date( 'U', $signup->registered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $diff = time() - mysql2date( 'U', $signup->registered );
</ins><span class="cx" style="display: block; padding: 0 10px"> // If registered more than two days ago, cancel registration and let this signup go through.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diff > 2 * DAY_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,7 +688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Has someone already signed up for this domain?
</span><span class="cx" style="display: block; padding: 0 10px"> $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) ); // TODO: Check email too?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $signup ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $diff = current_time( 'timestamp', true ) - mysql2date( 'U', $signup->registered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $diff = time() - mysql2date( 'U', $signup->registered );
</ins><span class="cx" style="display: block; padding: 0 10px"> // If registered more than two days ago, cancel registration and let this signup go through.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diff > 2 * DAY_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete(
</span></span></pre>
</div>
</div>
</body>
</html>