<!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>[42217] trunk/src: General: Reformat inline `if ()` statements inside HTML tags.</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/42217">42217</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/42217","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>2017-11-23 04:08:42 +0000 (Thu, 23 Nov 2017)</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'>General: Reformat inline `if ()` statements inside HTML tags.
This pattern occurs a handful of times across the codebase:
`<div class="foo<?php if ( $bar ) { echo ' baz'; } ?>">`
Unfortunately, it doesn't really play nicely with `phpcbf`, so all instances need to be removed in preperation for auto code formatting.
See <a href="https://core.trac.wordpress.org/ticket/41057">#41057</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.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="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.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="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenheaderphp">trunk/src/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/functions.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenulocationcontrolphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-location-control.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="#trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp">trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></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/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/edit-form-advanced.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,8 +627,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'edit_form_after_title', $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_supports($post_type, 'editor') ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_editor_expand_class = '';
+ if ( $_wp_editor_expand ) {
+ $_wp_editor_expand_class = ' wp-editor-expand';
+ }
</ins><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="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="postdivrich" class="postarea<?php echo $_wp_editor_expand_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_editor( $post->post_content, 'content', array(
</span><span class="cx" style="display: block; padding: 0 10px"> '_content_editor_dfw' => $_content_editor_dfw,
</span></span></pre></div>
<a id="trunksrcwpadminedittagformphp"></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/edit-tag-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tag-form.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/edit-tag-form.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,11 +113,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Current $taxonomy slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "{$taxonomy}_term_edit_form_top", $tag, $taxonomy );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$tag_name_value = '';
+if ( isset( $tag->name ) ) {
+ $tag_name_value = esc_attr( $tag->name );
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required term-name-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><input name="name" id="name" type="text" value="<?php echo $tag_name_value; ?>" size="40" aria-required="true" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( !global_terms_enabled() ) { ?>
</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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/includes/file.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1702,6 +1702,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' ';
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $password_value = '';
+ if ( defined('FTP_PASS') ) {
+ $password_value = '*****';
+ }
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1716,7 +1721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="ftp-password">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="password">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="field-title"><?php echo $label_pass; ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/includes/media.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,9 +525,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "admin_head_{$content_func}" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$body_id_attr = '';
+if ( isset( $GLOBALS['body_id'] ) ) {
+ $body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-core-ui no-js">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> document.body.className = document.body.className.replace('no-js', 'js');
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2738,15 +2743,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( "image_editor-$post->ID" );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $open_style = $not_open_style = '';
+ if ( $open ) {
+ $open_style = ' style="display:none"';
+ } else {
+ $not_open_style = ' style="display:none"';
+ }
</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"> <div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
</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<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div<?php echo $open_style; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $image_edit_button; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div<?php if ( ! $open ) echo ' style="display:none"'; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div<?php echo $not_open_style; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $open ) wp_image_editor( $attachment_id ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="save-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
-<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+ if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) {
+ $private_style = '';
+ if ( 'private' == $post->post_status ) {
+ $private_style = 'style="display:none"';
+ }
+?>
+<input <?php echo $private_style; ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,8 +109,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"> </span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+ if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) {
+ $private_style = '';
+ if ( 'private' == $post->post_status ) {
+ $private_style = 'style="display:none"';
+ }
+?>
+<a href="#post_status" <?php echo $private_style; ?> class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-status-select" class="hide-if-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
</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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/includes/nav-menu.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,21 +390,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $most_recent_url = $view_all_url = $search_url = '';
+ if ( $nav_menu_selected_id ) {
+ $most_recent_url = esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+ $view_all_url = esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+ $search_url = esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Most Recent' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'View All' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Search'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,21 +684,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $most_used_url = $view_all_url = $search_url = '';
+ if ( $nav_menu_selected_id ) {
+ $most_used_url = esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+ $view_all_url = esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+ $search_url = esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $taxonomy->labels->most_used ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'View All' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Search' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span></span></pre></div>
<a id="trunksrcwpadminincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/widgets.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/includes/widgets.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,6 +181,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id_format = $widget['id'];
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $id_base = isset($control['id_base']) ? $control['id_base'] : $widget_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $width = isset($control['width']) ? $control['width'] : '';
+ $height = isset($control['height']) ? $control['height'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,12 +246,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\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">+
+ $noform_class = '';
+ if ( 'noform' === $has_form ) {
+ $noform_class = ' widget-control-noform';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $after_widget_content; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
- <input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="widget-width" class="widget-width" value="<?php echo esc_attr($width); ?>" />
+ <input type="hidden" name="widget-height" class="widget-height" value="<?php echo esc_attr($height); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link widget-control-close"><?php _e( 'Done' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="alignright<?php echo $noform_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Save' ), 'primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/nav-menus.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,12 +589,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage with Live Preview' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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">+
+ $nav_tab_active_class = '';
+ if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
+ $nav_tab_active_class = ' nav-tab-active';
+ }
</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"> <hr class="wp-header-end">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; 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>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $num_locations && $menu_count ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <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>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,9 +635,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="menu-location-menus">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="0"><?php printf( '— %s —', esc_html__( 'Select a Menu' ) ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $nav_menus as $menu ) : ?>
- <?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
- <option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $nav_menus as $menu ) :
+ $data_orig = '';
+ $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id;
+ if ( $selected ) {
+ $data_orig = 'data-orig="true"';
+ }
+ ?>
+ <option <?php echo $data_orig; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo wp_html_excerpt( $menu->name, 40, '…' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,10 +732,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span><!-- /add-new-menu-action -->
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ endif;
+
+ $metabox_holder_disabled_class = '';
+ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+ $metabox_holder_disabled_class = ' metabox-holder-disabled';
+ }
+ ?>
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="menu-settings-column" class="metabox-holder<?php echo $metabox_holder_disabled_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,7 +757,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="menu-management-liquid">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="menu-management">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="update-nav-menu" method="post" enctype="multipart/form-data">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $new_screen_class = '';
+ if ( $add_new_screen ) {
+ $new_screen_class = 'blank-slate';
+ }
+ ?>
+ <div class="menu-edit <?php echo $new_screen_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="nav-menu-data">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -770,8 +794,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body-content" class="wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! $add_new_screen ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Menu Structure' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
- <div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $hide_style = '';
+ if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+ $hide_style = 'style="display: none;"';
+ }
+ $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
+ ?>
+ <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $starter_copy; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,8 +817,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_GET['use-location'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
- <div class="menu-settings" <?php if ( $one_theme_location_no_menus ) { ?>style="display: none;"<?php } ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ endif;
+
+ $no_menus_style = '';
+ if ( $one_theme_location_no_menus ) {
+ $no_menus_style = 'style="display: none;"';
+ }
+ ?>
+ <div class="menu-settings" <?php echo $no_menus_style; ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Menu Settings' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $auto_add ) ) {
</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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/options-discussion.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,6 +183,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $show_avatars = get_option( 'show_avatars' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$show_avatars_class = '';
+if ( ! $show_avatars ) {
+ $show_avatars_class = ' hide-if-js';
+}
</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"> <table class="form-table">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<tr class="avatar-settings<?php echo $show_avatars_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Maximum Rating'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<tr class="avatar-settings<?php echo $show_avatars_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Default Avatar'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/options-general.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,16 +68,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</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 if ( !is_multisite() ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+ if ( !is_multisite() ) {
+ $wp_site_url_class = $wp_home_class = '';
+ if ( defined( 'WP_SITEURL' ) ) {
+ $wp_site_url_class = ' disabled';
+ }
+ if ( defined( 'WP_HOME' ) ) {
+ $wp_home_class = ' disabled';
+ }
+?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php echo $wp_site_url_class; ?>" /></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php echo $wp_home_class; ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! defined( 'WP_HOME' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="home-description"><?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/setup-config.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,14 +91,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setup_config_display_header( $body_classes = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body_classes = (array) $body_classes;
</span><span class="cx" style="display: block; padding: 0 10px"> $body_classes[] = 'wp-core-ui';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dir_attr = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_rtl() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body_classes[] = 'rtl';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dir_attr = ' dir="rtl"';
</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"> header( 'Content-Type: text/html; charset=utf-8' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width" />
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/themes.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,8 +250,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_action = esc_attr( $theme['id'] . '-action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_name = esc_attr( $theme['id'] . '-name' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $active_class = '';
+ if ( $theme['active'] ) {
+ $active_class = ' active';
+ }
</ins><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="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="theme<?php echo $active_class; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-screenshot">
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-admin/user-edit.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-rich-editing-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Visual Editor' ); ?></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-syntax-highlighting-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="syntax_highlighting"><input name="syntax_highlighting" type="checkbox" id="syntax_highlighting" value="false" <?php if ( ! empty( $profileuser->syntax_highlighting ) ) checked( 'false', $profileuser->syntax_highlighting ); ?> /> <?php _e( 'Disable syntax highlighting when editing code' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="syntax_highlighting"><input name="syntax_highlighting" type="checkbox" id="syntax_highlighting" value="false" <?php checked( 'false', $profileuser->syntax_highlighting ); ?> /> <?php _e( 'Disable syntax highlighting when editing code' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-comment-shortcuts-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="show-admin-bar user-admin-bar-front-wrap">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/header.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-content/themes/twentyeleven/header.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,8 +119,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Has the text been hidden?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'blank' == get_header_textcolor() ) :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $header_image_class = '';
+ if ( $header_image ) {
+ $header_image_class = ' with-image';
+ }
</ins><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="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="only-search<?php echo $header_image_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/functions.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-content/themes/twentyseventeen/functions.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,8 +398,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( get_parent_theme_file_path( '/inc/color-patterns.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $hue = absint( get_theme_mod( 'colorscheme_hue', 250 ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $customize_preview_data_hue = '';
+ if ( is_customize_preview() ) {
+ $customize_preview_data_hue = 'data-hue="' . $hue . '"';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <style type="text/css" id="custom-theme-colors" <?php if ( is_customize_preview() ) { echo 'data-hue="' . $hue . '"'; } ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <style type="text/css" id="custom-theme-colors" <?php echo $customize_preview_data_hue; ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo twentyseventeen_custom_colors_css(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php }
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenulocationcontrolphp"></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/customize/class-wp-customize-nav-menu-location-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-location-control.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-location-control.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,6 +56,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->choices ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $value_hidden_class = $no_value_hidden_class = '';
+ if ( $this->value() ) {
+ $value_hidden_class = ' hidden';
+ } else {
+ $no_value_hidden_class = ' hidden';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $this->label ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,8 +81,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="button" class="button-link create-menu<?php if ( $this->value() ) { echo ' hidden'; } ?>" data-location-id="<?php echo esc_attr( $this->location_id ); ?>" aria-label="<?php esc_attr_e( 'Create a menu for this location' ); ?>"><?php _e( '+ Create New Menu' ); ?></button>
- <button type="button" class="button-link edit-menu<?php if ( ! $this->value() ) { echo ' hidden'; } ?>" aria-label="<?php esc_attr_e( 'Edit selected menu' ); ?>"><?php _e( 'Edit Menu' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link create-menu<?php echo $value_hidden_class; ?>" data-location-id="<?php echo esc_attr( $this->location_id ); ?>" aria-label="<?php esc_attr_e( 'Create a menu for this location' ); ?>"><?php _e( '+ Create New Menu' ); ?></button>
+ <button type="button" class="button-link edit-menu<?php echo $no_value_hidden_class; ?>" aria-label="<?php esc_attr_e( 'Edit selected menu' ); ?>"><?php _e( 'Edit Menu' ); ?></button>
</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="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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-includes/functions.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2755,9 +2755,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_direction = 'rtl';
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( function_exists( 'is_rtl' ) && is_rtl() )
</span><span class="cx" style="display: block; padding: 0 10px"> $text_direction = 'rtl';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
+ $dir_attr = get_language_attributes();
+ } else {
+ $dir_attr = "dir='$text_direction'";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo $dir_attr; ?>>
</ins><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="text/html; charset=utf-8" />
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3768,9 +3774,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> status_header( 500 );
</span><span class="cx" style="display: block; padding: 0 10px"> nocache_headers();
</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">+
+ $dir_attr = '';
+ if ( is_rtl() ) {
+ $dir_attr = ' dir="rtl"';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
</ins><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="text/html; charset=utf-8" />
</span><span class="cx" style="display: block; padding: 0 10px"> <title><?php _e( 'Database Error' ); ?></title>
</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 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-includes/load.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,9 +211,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( "$protocol 503 Service Unavailable", true, 503 );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/html; charset=utf-8' );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Retry-After: 600' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $dir_attr = '';
+ if ( is_rtl() ) {
+ $dir_attr = ' dir="rtl"';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
</ins><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="text/html; charset=utf-8" />
</span><span class="cx" style="display: block; padding: 0 10px"> <title><?php _e( 'Maintenance' ); ?></title>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp"></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/widgets/class-wp-nav-menu-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,9 +120,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get menus
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = wp_get_nav_menus();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $empty_menus_style = $not_empty_menus_style = '';
+ if ( empty( $menus ) ) {
+ $empty_menus_style = ' style="display:none" ';
+ } else {
+ $not_empty_menus_style = ' style="display:none" ';
+ }
+
+ $nav_menu_style = '';
+ if ( ! $nav_menu ) {
+ $nav_menu_style = 'display: none;';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If no menus exists, direct the user to go and create some.
</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 class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="nav-menu-widget-no-menus-message" <?php echo $not_empty_menus_style; ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_customize instanceof WP_Customize_Manager ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'javascript: wp.customize.panel( "nav_menus" ).focus();';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-menu-widget-form-controls" <?php if ( empty( $menus ) ) { echo ' style="display:none" '; } ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-menu-widget-form-controls" <?php echo $empty_menus_style; ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ) ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>"/>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_customize instanceof WP_Customize_Manager ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="edit-selected-nav-menu" style="<?php if ( ! $nav_menu ) { echo 'display: none;'; } ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="edit-selected-nav-menu" style="<?php echo $nav_menu_style; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button"><?php _e( 'Edit Menu' ) ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2017-11-22 15:15:35 UTC (rev 42216)
+++ trunk/src/wp-signup.php 2017-11-23 04:08:42 UTC (rev 42217)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,19 +166,28 @@
</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"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; // Languages. ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ endif; // Languages.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_public_on_checked = $blog_public_off_checked = '';
+ if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) {
+ $blog_public_off_checked = 'checked="checked"';
+ } else {
+ $blog_public_on_checked = 'checked="checked"';
+ }
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="privacy">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="privacy-intro">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="blog_public_on"><?php _e('Privacy:') ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Allow search engines to index this site.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <br style="clear:both" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="checkbox" for="blog_public_on">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php echo $blog_public_on_checked; ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _e( 'Yes' ); ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="checkbox" for="blog_public_off">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if ( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php echo $blog_public_off_checked; ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _e( 'No' ); ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre>
</div>
</div>
</body>
</html>