<!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>[39323] trunk/src: I18n: Begin introducing translator comments for strings which include placeholders but no accompanying translator comment.</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" 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/39323">39323</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/39323","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-21 01:21:01 +0000 (Mon, 21 Nov 2016)</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'>I18n: Begin introducing translator comments for strings which include placeholders but no accompanying translator comment.
Adds context to one string used in two different contexts for the new user and new site signup email notification.
More to come.
See <a href="https://core.trac.wordpress.org/ticket/38882">#38882</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminrevisionphp">trunk/src/wp-admin/revision.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpincludesfeedatomcommentsphp">trunk/src/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunksrcwpincludesfeedrss2commentsphp">trunk/src/wp-includes/feed-rss2-comments.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/includes/update.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,6 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $cur->response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'development' :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrade' :
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/includes/upgrade.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,6 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email = $user->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> $name = $user->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> $login_url = wp_login_url();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __( "Your new WordPress site has been successfully set up at:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> %1\$s
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></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/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/install.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,12 +232,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $php_compat = version_compare( $php_version, $required_php_version, '>=' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
</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 ( !$mysql_compat && !$php_compat )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( !$mysql_compat && !$php_compat ) {
+ /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-elseif ( !$php_compat )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( !$php_compat ) {
+ /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-elseif ( !$mysql_compat )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( !$mysql_compat ) {
+ /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
</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><span class="cx" style="display: block; padding: 0 10px"> if ( !$mysql_compat || !$php_compat ) {
</span><span class="cx" style="display: block; padding: 0 10px"> display_header();
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></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/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/nav-menus.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,6 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $locations_screen ) : // Main tab
</span><span class="cx" style="display: block; padding: 0 10px"> $overview = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Custom Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></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/options-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/options-discussion.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
</span><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page .= '>' . __('first') . '</option></select>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* translators: 1: Form field control for number of top level comments per page, 2: Form field control for the 'first' or 'last' page */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?></label>
</span></span></pre></div>
<a id="trunksrcwpadminrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/revision.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/revision.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,6 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_edit_link = get_edit_post_link();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_title = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $h1 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $return_to_post = '<a href="' . $post_edit_link . '">' . __( '← Return to editor' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Revisions' );
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-admin/update-core.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,12 +68,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$mysql_compat && !$php_compat )
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( !$php_compat )
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( !$mysql_compat )
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically:'), $update->current, $version_string);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$mysql_compat || !$php_compat )
</span><span class="cx" style="display: block; padding: 0 10px"> $show_buttons = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,6 +662,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @TODO
+
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('upgrade-core');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['plugins'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesfeedatomcommentsphp"></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/feed-atom-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom-comments.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/feed-atom-comments.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,12 +28,16 @@
</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"> <title type="text"><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_singular() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_singular() ) {
+ /* translators: Comments feed title. 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( is_search() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_search() ) {
+ /* translators: Comments feed title. 1: Site name, 2: Search query */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Comments feed title. 1: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,8 +77,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = get_the_title($comment_post->ID);
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/feed.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $title = apply_filters( 'the_title_rss', $title );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Individual comment title. 1: Post title, 2: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment author title. 1: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(ent2ncr(__('By: %s')), get_comment_author_rss());
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?></title>
</span></span></pre></div>
<a id="trunksrcwpincludesfeedrss2commentsphp"></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/feed-rss2-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss2-comments.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/feed-rss2-comments.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,12 +33,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><span class="cx" style="display: block; padding: 0 10px"> <channel>
</span><span class="cx" style="display: block; padding: 0 10px"> <title><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_singular() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_singular() ) {
+ /* translators: Comments feed title. 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( is_search() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_search() ) {
+ /* translators: Comments feed title. 1: Site name, 2: Search query */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Comments feed title. 1: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx" style="display: block; padding: 0 10px"> <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,8 +76,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = get_the_title($comment_post->ID);
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/feed.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $title = apply_filters( 'the_title_rss', $title );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Individual comment title. 1: Post title, 2: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment author title. 1: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(ent2ncr(__('By: %s')), get_comment_author_rss());
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?></title>
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/functions.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4087,6 +4087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= ' ' . sprintf( __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Debugging_in_WordPress' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message */
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $version ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/load.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,6 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $protocol = wp_get_server_protocol();
</span><span class="cx" style="display: block; padding: 0 10px"> header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/html; charset=utf-8' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Current PHP version number, 2: WordPress version number, 3: Minimum required PHP version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
</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="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 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/ms-functions.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,7 +846,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta By default, contains the requested privacy setting and lang_id.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters( 'wpmu_signup_blog_notification_subject',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '[%1$s] Activate %2$s' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email subject. 1: Network name, 2: New site URL */
+ _x( '[%1$s] Activate %2$s', 'New site notification email subject' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $domain, $path, $title, $user_login, $user_email, $key, $meta
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -939,7 +940,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta Signup meta data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters( 'wpmu_signup_user_notification_subject',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '[%1$s] Activate %2$s' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New user notification email subject. 1: Network name, 2: New user login */
+ _x( '[%1$s] Activate %2$s', 'New user notification email subject' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_login, $user_email, $key, $meta
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1202,6 +1204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $siteurl = site_url();
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf( __( 'New Site: %1$s
</span><span class="cx" style="display: block; padding: 0 10px"> URL: %2$s
</span><span class="cx" style="display: block; padding: 0 10px"> Remote IP: %3$s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1244,6 +1247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options_site_url = esc_url(network_admin_url('settings.php'));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf(__('New User: %1$s
</span><span class="cx" style="display: block; padding: 0 10px"> Remote IP: %2$s
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,6 +1527,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $current_network->site_name ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $current_network->site_name = 'WordPress';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email subject. 1: Network name, 2: New site name */
+ $subject = __( 'New %1$s Site: %2$s' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the subject of the welcome email after site activation.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1530,7 +1537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the email.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_network->site_name, wp_unslash( $title ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = apply_filters( 'update_welcome_subject', sprintf( $subject, $current_network->site_name, wp_unslash( $title ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1608,6 +1615,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $current_network->site_name ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $current_network->site_name = 'WordPress';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New user notification email subject. 1: Network name, 2: New user login */
+ $subject = __( 'New %1$s User: %2$s' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the subject of the welcome email after user activation.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1615,7 +1625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the email.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_network->site_name, $user->user_login) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/pluggable.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1626,6 +1626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation notification email subject. 1: Site name, 2: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $message_headers = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/script-loader.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,6 +289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_limit_exceeded' => __('You may only upload 1 file.'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'http_error' => __('HTTP error.'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_failed' => __('Upload failed.'),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Opening link tag, 2: Closing link tag */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'big_upload_failed' => __('Please try uploading this file with the %1$sbrowser uploader%2$s.'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'big_upload_queued' => __('%s exceeds the maximum upload size for the multi-file uploader when used in your browser.'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'io_error' => __('IO error.'),
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></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/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-includes/wp-db.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1364,10 +1364,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</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 ( $caller = $this->get_caller() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $caller = $this->get_caller() ) {
+ /* translators: 1: Database error message, 2: SQL query, 3: Name of the calling function */
</ins><span class="cx" style="display: block; padding: 0 10px"> $error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: 1: Database error message, 2: SQL query */
</ins><span class="cx" style="display: block; padding: 0 10px"> $error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
</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><span class="cx" style="display: block; padding: 0 10px"> error_log( $error_str );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3213,8 +3216,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function check_database_version() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version, $required_mysql_version;
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the server has the required MySQL version
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( version_compare($this->db_version(), $required_mysql_version, '<') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( version_compare($this->db_version(), $required_mysql_version, '<') ) {
+ /* translators: 1: WordPress version number, 2: Minimum required MySQL version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
</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><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="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2016-11-20 22:35:44 UTC (rev 39322)
+++ trunk/src/wp-login.php 2016-11-21 01:21:01 UTC (rev 39323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,10 +787,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( headers_sent() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If cookies are disabled we can't log in even with a valid user+pass
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Browser cookie documentation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://codex.wordpress.org/Cookies' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>