<!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>[29205] trunk/src: Fix syntax for single- and multi-line comments in root-directory files.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29205">29205</a></dd>
<dt>Author</dt> <dd>DrewAPicture</dd>
<dt>Date</dt> <dd>2014-07-17 09:11:46 +0000 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix syntax for single- and multi-line comments in root-directory files.
See <a href="http://core.trac.wordpress.org/ticket/28931">#28931</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunksrcwpmailphp">trunk/src/wp-mail.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-login.php (29204 => 29205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-login.php 2014-07-17 03:54:44 UTC (rev 29204)
+++ trunk/src/wp-login.php 2014-07-17 09:11:46 UTC (rev 29205)
</span><span class="lines">@@ -69,9 +69,11 @@
</span><span class="cx">
</span><span class="cx"> wp_admin_css( 'login', true );
</span><span class="cx">
</span><del>- // Remove all stored post data on logging out.
- // This could be added by add_action('login_head'...) like wp_shake_js()
- // but maybe better if it's not removable by plugins
</del><ins>+ /*
+ * Remove all stored post data on logging out.
+ * This could be added by add_action('login_head'...) like wp_shake_js(),
+ * but maybe better if it's not removable by plugins
+ */
</ins><span class="cx"> if ( 'loggedout' == $wp_error->get_error_code() ) {
</span><span class="cx"> ?>
</span><span class="cx"> <script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script>
</span><span class="lines">@@ -296,7 +298,7 @@
</span><span class="cx"> return $errors;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // redefining user_login ensures we return the right case in the email
</del><ins>+ // Redefining user_login ensures we return the right case in the email.
</ins><span class="cx"> $user_login = $user_data->user_login;
</span><span class="cx"> $user_email = $user_data->user_email;
</span><span class="cx">
</span><span class="lines">@@ -309,6 +311,7 @@
</span><span class="cx"> * @param string $user_login The user login name.
</span><span class="cx"> */
</span><span class="cx"> do_action( 'retreive_password', $user_login );
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Fires before a new password is retrieved.
</span><span class="cx"> *
</span><span class="lines">@@ -364,8 +367,10 @@
</span><span class="cx"> if ( is_multisite() )
</span><span class="cx"> $blogname = $GLOBALS['current_site']->site_name;
</span><span class="cx"> else
</span><del>- // The blogname option is escaped with esc_html on the way into the database in sanitize_option
- // we want to reverse this for the plain text arena of emails.
</del><ins>+ /*
+ * The blogname option is escaped with esc_html on the way into the database
+ * in sanitize_option we want to reverse this for the plain text arena of emails.
+ */
</ins><span class="cx"> $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span><span class="cx">
</span><span class="cx"> $title = sprintf( __('[%s] Password Reset'), $blogname );
</span></span></pre></div>
<a id="trunksrcwpmailphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-mail.php (29204 => 29205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-mail.php 2014-07-17 03:54:44 UTC (rev 29204)
+++ trunk/src/wp-mail.php 2014-07-17 09:11:46 UTC (rev 29205)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> $author_found = false;
</span><span class="cx"> $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
</span><span class="cx"> foreach ($message as $line) {
</span><del>- // body signal
</del><ins>+ // Body signal.
</ins><span class="cx"> if ( strlen($line) < 3 )
</span><span class="cx"> $bodysignal = true;
</span><span class="cx"> if ( $bodysignal ) {
</span><span class="lines">@@ -108,8 +108,10 @@
</span><span class="cx"> $subject = $subject[0];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Set the author using the email address (From or Reply-To, the last used)
- // otherwise use the site admin
</del><ins>+ /*
+ * Set the author using the email address (From or Reply-To, the last used)
+ * otherwise use the site admin.
+ */
</ins><span class="cx"> if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
</span><span class="cx"> if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
</span><span class="cx"> $author = $matches[0];
</span><span class="lines">@@ -171,7 +173,8 @@
</span><span class="cx"> if ( $content_type == 'multipart/alternative' ) {
</span><span class="cx"> $content = explode('--'.$boundary, $content);
</span><span class="cx"> $content = $content[2];
</span><del>- // match case-insensitive content-transfer-encoding
</del><ins>+
+ // Match case-insensitive content-transfer-encoding.
</ins><span class="cx"> if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
</span><span class="cx"> $content = explode($delim[0], $content);
</span><span class="cx"> $content = $content[1];
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-signup.php (29204 => 29205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-signup.php 2014-07-17 03:54:44 UTC (rev 29204)
+++ trunk/src/wp-signup.php 2014-07-17 09:11:46 UTC (rev 29205)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">
</span><span class="cx"> $result = validate_blog_form();
</span><span class="cx">
</span><del>- // extracted values set/overwrite globals
</del><ins>+ // Extracted values set/overwrite globals.
</ins><span class="cx"> $domain = $result['domain'];
</span><span class="cx"> $path = $result['path'];
</span><span class="cx"> $blogname = $result['blogname'];
</span></span></pre>
</div>
</div>
</body>
</html>