<!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>[43569] trunk/src: Coding Standards: Prepare for upgrading WPCS to 1.0.0.</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/43569">43569</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/43569","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-08-15 06:22:00 +0000 (Wed, 15 Aug 2018)</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'>Coding Standards: Prepare for upgrading WPCS to 1.0.0.
In order to get the best result when running `phpcbf` across the codebase, there are some manual tweaks we need to make.
These fall into three categories:
- Fixing incorrectly indented code which has flow-on effects when auto-fixing.
- Tweaking the layout of inline PHP inside HTML tags.
- Moving more complex inline PHP inside HTML tags, to execute earlier.
See <a href="https://core.trac.wordpress.org/ticket/44600">#44600</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcindexphp">trunk/src/index.php</a></li>
<li><a href="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>
<li><a href="#trunksrcwpadminfreedomsphp">trunk/src/wp-admin/freedoms.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminindexphp">trunk/src/wp-admin/index.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunksrcxmlrpcphp">trunk/src/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/index.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/index.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,24 +26,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Die with an error message
</span><span class="cx" style="display: block; padding: 0 10px"> $die = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
- __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
- 'WordPress',
- '<code>src</code>',
- '<code>build</code>'
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
+ __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
+ 'WordPress',
+ '<code>src</code>',
+ '<code>build</code>'
+) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can build %s by running:' ),
- 'WordPress'
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can build %s by running:' ),
+ 'WordPress'
+) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p><code>npm install && grunt build</code></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: NPM URL, %2$s: Grunt URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
- 'https://www.npmjs.com/',
- 'https://gruntjs.com/',
- __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
+ 'https://www.npmjs.com/',
+ 'https://gruntjs.com/',
+ __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
+) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $die, __( 'WordPress › Error' ) );
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-activate.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-activate.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="signup-content" class="widecolumn">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-activate-container">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Activation Key Required' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,49 +91,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
-} else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = ! empty( $_GET['key'] ) ? $_GET['key'] : $_POST['key'];
- $result = wpmu_activate_signup( $key );
- if ( is_wp_error( $result ) ) {
- if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
- $signup = $result->get_error_data();
- ?>
- <h2><?php _e( 'Your account is now active!' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = ! empty( $_GET['key'] ) ? $_GET['key'] : $_POST['key'];
+ $result = wpmu_activate_signup( $key );
+ if ( is_wp_error( $result ) ) {
+ if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+ $signup = $result->get_error_data();
+ ?>
+ <h2><?php _e( 'Your account is now active!' ); ?></h2>
+ <?php
+ echo '<p class="lead-in">';
+ if ( $signup->domain . $signup->path == '' ) {
+ printf(
+ /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+ __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+ network_site_url( 'wp-login.php', 'login' ),
+ $signup->user_login,
+ $signup->user_email,
+ wp_lostpassword_url()
+ );
+ } else {
+ printf(
+ /* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+ __( 'Your site at %1$s is active. You may now log in to your site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+ sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
+ $signup->user_login,
+ $signup->user_email,
+ wp_lostpassword_url()
+ );
+ }
+ echo '</p>';
+ } else {
+ ?>
+ <h2><?php _e( 'An error occurred during the activation' ); ?></h2>
+ <p><?php echo $result->get_error_message(); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p class="lead-in">';
- if ( $signup->domain . $signup->path == '' ) {
- printf(
- /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
- __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
- network_site_url( 'wp-login.php', 'login' ),
- $signup->user_login,
- $signup->user_email,
- wp_lostpassword_url()
- );
- } else {
- printf(
- /* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
- __( 'Your site at %1$s is active. You may now log in to your site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
- sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
- $signup->user_login,
- $signup->user_email,
- wp_lostpassword_url()
- );
- }
- echo '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+ $user = get_userdata( (int) $result['user_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php _e( 'An error occurred during the activation' ); ?></h2>
- <p><?php echo $result->get_error_message(); ?></p>
- <?php
- }
- } else {
- $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
- $user = get_userdata( (int) $result['user_id'] );
- ?>
- <h2><?php _e( 'Your account is now active!' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php _e( 'Your account is now active!' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="signup-welcome">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,8 +161,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">-}
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminfreedomsphp"></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/freedoms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/freedoms.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/freedoms.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_privacy_notice = isset( $_GET['privacy-notice'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $is_privacy_notice ) {
+ $freedoms_class = '';
+ $privacy_class = ' nav-tab-active';
+} else {
+ $freedoms_class = ' nav-tab-active';
+ $privacy_class = '';
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap about-wrap full-width-layout">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,8 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="nav-tab-wrapper wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="about.php" class="nav-tab"><?php _e( 'What’s New' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="freedoms.php" class="nav-tab<?php if ( ! $is_privacy_notice ) { echo ' nav-tab-active'; } ?>"><?php _e( 'Freedoms' ); ?></a>
- <a href="freedoms.php?privacy-notice" class="nav-tab<?php if ( $is_privacy_notice ) { echo ' nav-tab-active'; } ?>"><?php _e( 'Privacy' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="freedoms.php" class="nav-tab<?php echo $freedoms_class; ?>"><?php _e( 'Freedoms' ); ?></a>
+ <a href="freedoms.php?privacy-notice" class="nav-tab<?php echo $privacy_class; ?>"><?php _e( 'Privacy' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $is_privacy_notice ) : ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/includes/file.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1817,21 +1817,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'If you do not remember your credentials, you should contact your web host.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hostname_value = esc_attr( $hostname );
+ if ( ! empty( $port ) ) {
+ $hostname_value .= ":$port";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $password_value = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( defined( 'FTP_PASS' ) ) {
- $password_value = '*****';
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'FTP_PASS' ) ) {
+ $password_value = '*****';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="hostname">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="field-title"><?php _e( 'Hostname' ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ); ?>" value="
- <?php
- echo esc_attr( $hostname );
- if ( ! empty( $port ) ) {
- echo ":$port";}
-?>
-"<?php disabled( defined( 'FTP_HOST' ) ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ); ?>" value="<?php echo $hostname_value; ?>"<?php disabled( defined( 'FTP_HOST' ) ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="ftp-username">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="username">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1858,12 +1857,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $types as $name => $text ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo esc_attr( $name ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="radio" name="connection_type" id="<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>"
- <?php
- checked( $name, $connection_type );
- echo $disabled;
-?>
- />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="radio" name="connection_type" id="<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>" <?php checked( $name, $connection_type ); ?> <?php echo $disabled; ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo $text; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,15 +757,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="advanced_view" type="hidden" value="1" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="meta-options">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked( $post->comment_status, 'open' ); ?> /> <?php _e( 'Allow comments' ); ?></label><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked( $post->ping_status, 'open' ); ?> />
- <?php
- printf(
- /* translators: %s: Codex URL */
- __( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
- __( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked( $post->ping_status, 'open' ); ?> />
+ <?php
+ printf(
+ /* translators: %s: Codex URL */
+ __( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
+ __( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the end of the Discussion meta box on the post editing screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1350,16 +1350,14 @@
</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"> foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = '';
+ if ( ! empty( $meta[ $key ] ) ) {
+ $value = $meta[ $key ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="title"><?php echo $label; ?></label><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" name="id3_<?php echo esc_attr( $key ); ?>" id="id3_<?php echo esc_attr( $key ); ?>" class="large-text" value="
- <?php
- if ( ! empty( $meta[ $key ] ) ) {
- echo esc_attr( $meta[ $key ] );
- }
- ?>
- " />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" name="id3_<?php echo esc_attr( $key ); ?>" id="id3_<?php echo esc_attr( $key ); ?>" class="large-text" value="<?php echo esc_attr( $value ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/includes/nav-menu.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,11 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- .posttype-tabs -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel
- <?php
- echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
- ?>
- ">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $recent_args = array_merge(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,11 +469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="tabs-panel
- <?php
- echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
- ?>
- " id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $searched = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,11 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all
- <?php
- echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
- ?>
- ">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $page_links ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="add-menu-item-pagelinks">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $page_links; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,11 +759,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- .taxonomy-tabs -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel
- <?php
- echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
- ?>
- ">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?> ">
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_terms = get_terms(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,11 +776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all
- <?php
- echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
- ?>
- ">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?> ">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $page_links ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="add-menu-item-pagelinks">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $page_links; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,11 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="tabs-panel
- <?php
- echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
- ?>
- " id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $searched = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/includes/plugin-install.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,20 +658,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } if ( isset( $api->active_installs ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><strong><?php _e( 'Active Installations:' ); ?></strong>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- if ( $api->active_installs >= 1000000 ) {
- $active_installs_millions = floor( $api->active_installs / 1000000 );
- printf(
- _nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
- number_format_i18n( $active_installs_millions )
- );
- } elseif ( 0 == $api->active_installs ) {
- _ex( 'Less Than 10', 'Active plugin installations' );
- } else {
- echo number_format_i18n( $api->active_installs ) . '+';
- }
- ?>
- </li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $api->active_installs >= 1000000 ) {
+ $active_installs_millions = floor( $api->active_installs / 1000000 );
+ printf(
+ _nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
+ number_format_i18n( $active_installs_millions )
+ );
+ } elseif ( 0 == $api->active_installs ) {
+ _ex( 'Less Than 10', 'Active plugin installations' );
+ } else {
+ echo number_format_i18n( $api->active_installs ) . '+';
+ }
+ ?>
+ </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a target="_blank" href="<?php echo __( 'https://wordpress.org/plugins/' ) . $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page »' ); ?></a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } if ( ! empty( $api->homepage ) ) { ?>
</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 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/includes/template.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2177,23 +2177,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <!--[if IE 8]>
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml" class="ie8 <?php echo $admin_html_class; ?>"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /**
- * Fires inside the HTML tag in the admin header.
- *
- * @since 2.2.0
- */
- do_action( 'admin_xml_ns' );
-?>
- <?php language_attributes(); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /**
+ * Fires inside the HTML tag in the admin header.
+ *
+ * @since 2.2.0
+ */
+ do_action( 'admin_xml_ns' );
+
+ language_attributes();
+ ?>
+ >
</ins><span class="cx" style="display: block; padding: 0 10px"> <![endif]-->
</span><span class="cx" style="display: block; padding: 0 10px"> <!--[if !(IE 8) ]><!-->
</span><span class="cx" style="display: block; padding: 0 10px"> <html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /** This action is documented in wp-admin/includes/template.php */
- do_action( 'admin_xml_ns' );
-?>
- <?php language_attributes(); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /** This action is documented in wp-admin/includes/template.php */
+ do_action( 'admin_xml_ns' );
+
+ language_attributes();
+ ?>
+ >
</ins><span class="cx" style="display: block; padding: 0 10px"> <!--<![endif]-->
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
</span></span></pre></div>
<a id="trunksrcwpadminindexphp"></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/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/index.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/index.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,24 +26,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Die with an error message
</span><span class="cx" style="display: block; padding: 0 10px"> $die = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
- __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
- 'WordPress',
- '<code>src</code>',
- '<code>build</code>'
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %1$s: WordPress, %2$s: src, %3$s: build */
+ __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
+ 'WordPress',
+ '<code>src</code>',
+ '<code>build</code>'
+) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can build %s by running:' ),
- 'WordPress'
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can build %s by running:' ),
+ 'WordPress'
+) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p><code>npm install && grunt build</code></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: NPM URL, %2$s: Grunt URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
- 'https://www.npmjs.com/',
- 'https://gruntjs.com/',
- __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
+ 'https://www.npmjs.com/',
+ 'https://gruntjs.com/',
+ __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
+) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $die, __( 'WordPress › Error' ) );
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</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 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/nav-menus.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,15 +628,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="nav-tab-wrapper wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $num_locations && $menu_count ) : ?>
- <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
- <?php
- if ( $locations_screen ) {
- echo ' nav-tab-active';}
-?>
-"><?php esc_html_e( 'Manage Locations' ); ?></a>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $num_locations && $menu_count ) {
+ $active_tab_class = '';
+ if ( $locations_screen ) {
+ $active_tab_class = ' nav-tab-active';
+ }
+ ?>
+ <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+ <?php
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -694,8 +695,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), admin_url( 'nav-menus.php' )
</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">-?>
-">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ ">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -712,8 +713,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), admin_url( 'nav-menus.php' )
</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">-?>
-">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ ">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _ex( 'Use new menu', 'menu' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,9 +819,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $metabox_holder_disabled_class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
- $metabox_holder_disabled_class = ' metabox-holder-disabled';
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+ $metabox_holder_disabled_class = ' metabox-holder-disabled';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /manage-menus -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-menus-frame" class="wp-clearfix">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,9 +843,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="update-nav-menu" method="post" enctype="multipart/form-data">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_screen_class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $add_new_screen ) {
- $new_screen_class = 'blank-slate';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $add_new_screen ) {
+ $new_screen_class = 'blank-slate';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Menu structure' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-edit <?php echo $new_screen_class; ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,9 +907,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $no_menus_style = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $one_theme_location_no_menus ) {
- $no_menus_style = 'style="display: none;"';
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $one_theme_location_no_menus ) {
+ $no_menus_style = 'style="display: none;"';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-settings" <?php echo $no_menus_style; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Menu Settings' ); ?></h3>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,8 +977,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), 'delete-nav_menu-' . $nav_menu_selected_id
</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">-?>
-"><?php _e( 'Delete Menu' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ "><?php _e( 'Delete Menu' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span><!-- END .delete-action -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="publishing-action">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></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/network/site-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/network/site-info.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,12 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="screen-reader-text"><?php _e( 'Set site attributes' ); ?></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1"
- <?php
- checked( (bool) $details->$field_key, true );
- disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) );
-?>
- />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo $field_label; ?></label><br/>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset>
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></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/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/theme-editor.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,8 +296,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_writeable( $file ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
-<strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'This is a file in your current parent theme.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-admin/update-core.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,29 +310,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="check-column">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /* translators: %s: plugin name */
- printf(
- __( 'Select %s' ),
- $plugin_data->Name
- );
- ?>
- </label>
- </td>
- <td class="plugin-title"><p>
- <?php echo $icon; ?>
- <strong><?php echo $plugin_data->Name; ?></strong>
- <?php
- /* translators: 1: plugin version, 2: new version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: plugin name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You have version %1$s installed. Update to %2$s.' ),
- $plugin_data->Version,
- $plugin_data->update->new_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Select %s' ),
+ $plugin_data->Name
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' ' . $details . $compat . $upgrade_notice;
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </p></td>
- </tr>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </label>
+ </td>
+ <td class="plugin-title"><p>
+ <?php echo $icon; ?>
+ <strong><?php echo $plugin_data->Name; ?></strong>
+ <?php
+ /* translators: 1: plugin version, 2: new version */
+ printf(
+ __( 'You have version %1$s installed. Update to %2$s.' ),
+ $plugin_data->Version,
+ $plugin_data->update->new_version
+ );
+ echo ' ' . $details . $compat . $upgrade_notice;
+ ?>
+ </p></td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">@@ -386,28 +386,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="check-column">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /* translators: %s: theme name */
- printf(
- __( 'Select %s' ),
- $theme->display( 'Name' )
- );
- ?>
- </label>
- </td>
- <td class="plugin-title"><p>
- <img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
- <strong><?php echo $theme->display( 'Name' ); ?></strong>
- <?php
- /* translators: 1: theme version, 2: new version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: theme name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You have version %1$s installed. Update to %2$s.' ),
- $theme->display( 'Version' ),
- $theme->update['new_version']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Select %s' ),
+ $theme->display( 'Name' )
</ins><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">- </p></td>
- </tr>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </label>
+ </td>
+ <td class="plugin-title"><p>
+ <img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
+ <strong><?php echo $theme->display( 'Name' ); ?></strong>
+ <?php
+ /* translators: 1: theme version, 2: new version */
+ printf(
+ __( 'You have version %1$s installed. Update to %2$s.' ),
+ $theme->display( 'Version' ),
+ $theme->update['new_version']
+ );
+ ?>
+ </p></td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</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 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/wp-login.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,9 +256,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $interim_login ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /* translators: %s: site title */
- printf( _x( '← Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: site title */
+ printf( _x( '← Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
</span></span></pre></div>
<a id="trunksrcxmlrpcphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/xmlrpc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/xmlrpc.php 2018-08-13 16:31:31 UTC (rev 43568)
+++ trunk/src/xmlrpc.php 2018-08-15 06:22:00 UTC (rev 43569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
-<?php echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>'; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
</span><span class="cx" style="display: block; padding: 0 10px"> <service>
</span><span class="cx" style="display: block; padding: 0 10px"> <engineName>WordPress</engineName>
</span></span></pre>
</div>
</div>
</body>
</html>