<!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>[48041] trunk/src/wp-admin/includes/meta-boxes.php: Coding Standards: Fix code indentation in `post_submit_meta_box()` to improve readability.</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/48041">48041</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/48041","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-14 16:29:33 +0000 (Sun, 14 Jun 2020)</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: Fix code indentation in `post_submit_meta_box()` to improve readability.
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2020-06-14 11:26:22 UTC (rev 48040)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2020-06-14 16:29:33 UTC (rev 48041)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function post_submit_meta_box( $post, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $action;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $post->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_publish = current_user_can( $post_type_object->cap->publish_posts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,269 +40,280 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key. ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div style="display:none;">
- <?php submit_button( __( 'Save' ), '', 'save' ); ?>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div style="display:none;">
+ <?php submit_button( __( 'Save' ), '', 'save' ); ?>
+ </div>
</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="minor-publishing-actions">
-<div id="save-action">
- <?php
- if ( ! in_array( $post->post_status, array( 'publish', 'future', 'pending' ), true ) ) {
- $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" />
-<span class="spinner"></span>
-<?php } elseif ( 'pending' === $post->post_status && $can_publish ) { ?>
-<input type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save as Pending' ); ?>" class="button" />
-<span class="spinner"></span>
-<?php } ?>
-</div>
- <?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
-<div id="preview-action">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="minor-publishing-actions">
+ <div id="save-action">
+ <?php
+ if ( ! in_array( $post->post_status, array( 'publish', 'future', 'pending' ), true ) ) {
+ $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" />
+ <span class="spinner"></span>
+ <?php } elseif ( 'pending' === $post->post_status && $can_publish ) { ?>
+ <input type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save as Pending' ); ?>" class="button" />
+ <span class="spinner"></span>
+ <?php } ?>
+ </div>
+
</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">- $preview_link = esc_url( get_preview_post_link( $post ) );
- if ( 'publish' === $post->post_status ) {
- $preview_button_text = __( 'Preview Changes' );
- } else {
- $preview_button_text = __( 'Preview' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_post_type_viewable( $post_type_object ) ) :
+ ?>
+ <div id="preview-action">
+ <?php
+ $preview_link = esc_url( get_preview_post_link( $post ) );
+ if ( 'publish' === $post->post_status ) {
+ $preview_button_text = __( 'Preview Changes' );
+ } else {
+ $preview_button_text = __( 'Preview' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_button = sprintf(
- '%1$s<span class="screen-reader-text"> %2$s</span>',
- $preview_button_text,
- /* translators: Accessibility text. */
- __( '(opens in a new tab)' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_button = sprintf(
+ '%1$s<span class="screen-reader-text"> %2$s</span>',
+ $preview_button_text,
+ /* translators: Accessibility text. */
+ __( '(opens in a new tab)' )
+ );
+ ?>
+ <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo $post_id; ?>" id="post-preview"><?php echo $preview_button; ?></a>
+ <input type="hidden" name="wp-preview" id="wp-preview" value="" />
+ </div>
+ <?php
+ endif;
+
+ /**
+ * Fires before the post time/date setting in the Publish meta box.
+ *
+ * @since 4.4.0
+ *
+ * @param WP_Post $post WP_Post object for the current post.
+ */
+ do_action( 'post_submitbox_minor_actions', $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
-<input type="hidden" name="wp-preview" id="wp-preview" value="" />
-</div>
-<?php endif; // is_post_type_viewable() ?>
- <?php
- /**
- * Fires before the post time/date setting in the Publish meta box.
- *
- * @since 4.4.0
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
- do_action( 'post_submitbox_minor_actions', $post );
- ?>
-<div class="clear"></div>
-</div><!-- #minor-publishing-actions -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="clear"></div>
+ </div>
</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="misc-publishing-actions">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="misc-publishing-actions">
+ <div class="misc-pub-section misc-pub-post-status">
+ <?php _e( 'Status:' ); ?>
+ <span id="post-status-display">
+ <?php
+ switch ( $post->post_status ) {
+ case 'private':
+ _e( 'Privately Published' );
+ break;
+ case 'publish':
+ _e( 'Published' );
+ break;
+ case 'future':
+ _e( 'Scheduled' );
+ break;
+ case 'pending':
+ _e( 'Pending Review' );
+ break;
+ case 'draft':
+ case 'auto-draft':
+ _e( 'Draft' );
+ break;
+ }
+ ?>
+ </span>
</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="misc-pub-section misc-pub-post-status">
- <?php _e( 'Status:' ); ?> <span id="post-status-display">
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $post->post_status ) {
- case 'private':
- _e( 'Privately Published' );
- break;
- case 'publish':
- _e( 'Published' );
- break;
- case 'future':
- _e( 'Scheduled' );
- break;
- case 'pending':
- _e( 'Pending Review' );
- break;
- case 'draft':
- case 'auto-draft':
- _e( 'Draft' );
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="post-status-select" class="hide-if-js">
+ <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 ); ?>" />
+ <label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
+ <select name="post_status" id="post_status">
+ <?php if ( 'publish' === $post->post_status ) : ?>
+ <option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
+ <?php elseif ( 'private' === $post->post_status ) : ?>
+ <option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>
+ <?php elseif ( 'future' === $post->post_status ) : ?>
+ <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e( 'Scheduled' ); ?></option>
+ <?php endif; ?>
+ <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e( 'Pending Review' ); ?></option>
+ <?php if ( 'auto-draft' === $post->post_status ) : ?>
+ <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
+ <?php else : ?>
+ <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
+ <?php endif; ?>
+ </select>
+ <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+ <a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+ </div>
+ <?php
</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">-</span>
- <?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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</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="post-status-select" class="hide-if-js">
-<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 ); ?>" />
-<label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
-<select name="post_status" id="post_status">
- <?php if ( 'publish' === $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
-<?php elseif ( 'private' === $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>
-<?php elseif ( 'future' === $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e( 'Scheduled' ); ?></option>
-<?php endif; ?>
-<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e( 'Pending Review' ); ?></option>
- <?php if ( 'auto-draft' === $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
-<?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
-<?php endif; ?>
-</select>
-<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
-<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="misc-pub-section misc-pub-visibility" id="visibility">
+ <?php _e( 'Visibility:' ); ?>
+ <span id="post-visibility-display">
+ <?php
+ if ( 'private' === $post->post_status ) {
+ $post->post_password = '';
+ $visibility = 'private';
+ $visibility_trans = __( 'Private' );
+ } elseif ( ! empty( $post->post_password ) ) {
+ $visibility = 'password';
+ $visibility_trans = __( 'Password protected' );
+ } elseif ( 'post' === $post_type && is_sticky( $post_id ) ) {
+ $visibility = 'public';
+ $visibility_trans = __( 'Public, Sticky' );
+ } else {
+ $visibility = 'public';
+ $visibility_trans = __( 'Public' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } ?>
-</div><!-- .misc-pub-section -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_html( $visibility_trans );
+ ?>
+ </span>
</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="misc-pub-section misc-pub-visibility" id="visibility">
- <?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $can_publish ) { ?>
+ <a href="#visibility" class="edit-visibility hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'private' === $post->post_status ) {
- $post->post_password = '';
- $visibility = 'private';
- $visibility_trans = __( 'Private' );
- } elseif ( ! empty( $post->post_password ) ) {
- $visibility = 'password';
- $visibility_trans = __( 'Password protected' );
- } elseif ( 'post' === $post_type && is_sticky( $post->ID ) ) {
- $visibility = 'public';
- $visibility_trans = __( 'Public, Sticky' );
- } else {
- $visibility = 'public';
- $visibility_trans = __( 'Public' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="post-visibility-select" class="hide-if-js">
+ <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
+ <?php if ( 'post' === $post_type ) : ?>
+ <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked( is_sticky( $post_id ) ); ?> />
+ <?php endif; ?>
</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 esc_html( $visibility_trans );
- ?>
-</span>
- <?php if ( $can_publish ) { ?>
-<a href="#visibility" class="edit-visibility hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
+ <input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e( 'Public' ); ?></label><br />
</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="post-visibility-select" class="hide-if-js">
-<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
- <?php if ( 'post' === $post_type ) : ?>
-<input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> />
-<?php endif; ?>
-<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
-<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e( 'Public' ); ?></label><br />
- <?php if ( 'post' === $post_type && current_user_can( 'edit_others_posts' ) ) : ?>
-<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
-<?php endif; ?>
-<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e( 'Password protected' ); ?></label><br />
-<span id="password-span"><label for="post_password"><?php _e( 'Password:' ); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr( $post->post_password ); ?>" maxlength="255" /><br /></span>
-<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e( 'Private' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === $post_type && current_user_can( 'edit_others_posts' ) ) : ?>
+ <span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post_id ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p>
- <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e( 'OK' ); ?></a>
- <a href="#visibility" class="cancel-post-visibility hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
-</p>
-</div>
-<?php } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e( 'Password protected' ); ?></label><br />
+ <span id="password-span"><label for="post_password"><?php _e( 'Password:' ); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr( $post->post_password ); ?>" maxlength="255" /><br /></span>
</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><!-- .misc-pub-section -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e( 'Private' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- /* translators: Publish box date string. 1: Date, 2: Time. See https://www.php.net/date */
- $date_string = __( '%1$s at %2$s' );
- /* translators: Publish box date format, see https://www.php.net/date */
- $date_format = _x( 'M j, Y', 'publish box date format' );
- /* translators: Publish box time format, see https://www.php.net/date */
- $time_format = _x( 'H:i', 'publish box time format' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+ <a href="#visibility" class="cancel-post-visibility hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+ </p>
+ </div>
+ <?php } ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 != $post->ID ) {
- if ( 'future' === $post->post_status ) { // Scheduled for publishing at a future date.
- /* translators: Post date information. %s: Date on which the post is currently scheduled to be published. */
- $stamp = __( 'Scheduled for: %s' );
- } elseif ( 'publish' === $post->post_status || 'private' === $post->post_status ) { // Already published.
- /* translators: Post date information. %s: Date on which the post was published. */
- $stamp = __( 'Published on: %s' );
- } elseif ( '0000-00-00 00:00:00' === $post->post_date_gmt ) { // Draft, 1 or more saves, no date specified.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: Publish box date string. 1: Date, 2: Time. See https://www.php.net/date */
+ $date_string = __( '%1$s at %2$s' );
+ /* translators: Publish box date format, see https://www.php.net/date */
+ $date_format = _x( 'M j, Y', 'publish box date format' );
+ /* translators: Publish box time format, see https://www.php.net/date */
+ $time_format = _x( 'H:i', 'publish box time format' );
+
+ if ( 0 !== $post_id ) {
+ if ( 'future' === $post->post_status ) { // Scheduled for publishing at a future date.
+ /* translators: Post date information. %s: Date on which the post is currently scheduled to be published. */
+ $stamp = __( 'Scheduled for: %s' );
+ } elseif ( 'publish' === $post->post_status || 'private' === $post->post_status ) { // Already published.
+ /* translators: Post date information. %s: Date on which the post was published. */
+ $stamp = __( 'Published on: %s' );
+ } elseif ( '0000-00-00 00:00:00' === $post->post_date_gmt ) { // Draft, 1 or more saves, no date specified.
+ $stamp = __( 'Publish <b>immediately</b>' );
+ } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // Draft, 1 or more saves, future date specified.
+ /* translators: Post date information. %s: Date on which the post is to be published. */
+ $stamp = __( 'Schedule for: %s' );
+ } else { // Draft, 1 or more saves, date specified.
+ /* translators: Post date information. %s: Date on which the post is to be published. */
+ $stamp = __( 'Publish on: %s' );
+ }
+ $date = sprintf(
+ $date_string,
+ date_i18n( $date_format, strtotime( $post->post_date ) ),
+ date_i18n( $time_format, strtotime( $post->post_date ) )
+ );
+ } else { // Draft (no saves, and thus no date specified).
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // Draft, 1 or more saves, future date specified.
- /* translators: Post date information. %s: Date on which the post is to be published. */
- $stamp = __( 'Schedule for: %s' );
- } else { // Draft, 1 or more saves, date specified.
- /* translators: Post date information. %s: Date on which the post is to be published. */
- $stamp = __( 'Publish on: %s' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date = sprintf(
+ $date_string,
+ date_i18n( $date_format, strtotime( current_time( 'mysql' ) ) ),
+ date_i18n( $time_format, strtotime( current_time( 'mysql' ) ) )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date = sprintf(
- $date_string,
- date_i18n( $date_format, strtotime( $post->post_date ) ),
- date_i18n( $time_format, strtotime( $post->post_date ) )
- );
- } else { // Draft (no saves, and thus no date specified).
- $stamp = __( 'Publish <b>immediately</b>' );
- $date = sprintf(
- $date_string,
- date_i18n( $date_format, strtotime( current_time( 'mysql' ) ) ),
- date_i18n( $time_format, strtotime( current_time( 'mysql' ) ) )
- );
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $args['args']['revisions_count'] ) ) :
- ?>
-<div class="misc-pub-section misc-pub-revisions">
- <?php
- /* translators: Post revisions heading. %s: The number of available revisions. */
- printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
- ?>
- <a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
-</div>
- <?php
-endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $args['args']['revisions_count'] ) ) :
+ ?>
+ <div class="misc-pub-section misc-pub-revisions">
+ <?php
+ /* translators: Post revisions heading. %s: The number of available revisions. */
+ printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
+ ?>
+ <a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
+ </div>
+ <?php
+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $can_publish ) : // Contributors don't get to choose the date of publish.
- ?>
-<div class="misc-pub-section curtime misc-pub-curtime">
- <span id="timestamp">
- <?php printf( $stamp, '<b>' . $date . '</b>' ); ?>
- </span>
- <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button">
- <span aria-hidden="true"><?php _e( 'Edit' ); ?></span>
- <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span>
- </a>
- <fieldset id="timestampdiv" class="hide-if-js">
- <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
- <?php touch_time( ( 'edit' === $action ), 1 ); ?>
- </fieldset>
-</div><?php // /misc-pub-section ?>
-<?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $can_publish ) : // Contributors don't get to choose the date of publish.
+ ?>
+ <div class="misc-pub-section curtime misc-pub-curtime">
+ <span id="timestamp">
+ <?php printf( $stamp, '<b>' . $date . '</b>' ); ?>
+ </span>
+ <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button">
+ <span aria-hidden="true"><?php _e( 'Edit' ); ?></span>
+ <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span>
+ </a>
+ <fieldset id="timestampdiv" class="hide-if-js">
+ <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
+ <?php touch_time( ( 'edit' === $action ), 1 ); ?>
+ </fieldset>
+ </div>
+ <?php
+ endif;
</ins><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 ( 'draft' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?>
- <div class="notice notice-info notice-alt inline">
- <p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'draft' === $post->post_status && get_post_meta( $post_id, '_customize_changeset_uuid', true ) ) :
+ ?>
+ <div class="notice notice-info notice-alt inline">
+ <p>
+ <?php
+ printf(
+ /* translators: %s: URL to the Customizer. */
+ __( 'This draft comes from your <a href="%s">unpublished customization changes</a>. You can edit, but there’s no need to publish now. It will be published automatically with those changes.' ),
+ esc_url(
+ add_query_arg(
+ 'changeset_uuid',
+ rawurlencode( get_post_meta( $post_id, '_customize_changeset_uuid', true ) ),
+ admin_url( 'customize.php' )
+ )
+ )
+ );
+ ?>
+ </p>
+ </div>
</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 sprintf(
- /* translators: %s: URL to the Customizer. */
- __( 'This draft comes from your <a href="%s">unpublished customization changes</a>. You can edit, but there’s no need to publish now. It will be published automatically with those changes.' ),
- esc_url(
- add_query_arg(
- 'changeset_uuid',
- rawurlencode( get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ),
- admin_url( 'customize.php' )
- )
- )
- );
- ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif;
+
+ /**
+ * Fires after the post time/date setting in the Publish meta box.
+ *
+ * @since 2.9.0
+ * @since 4.4.0 Added the `$post` parameter.
+ *
+ * @param WP_Post $post WP_Post object for the current post.
+ */
+ do_action( 'post_submitbox_misc_actions', $post );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
-
- <?php
- /**
- * Fires after the post time/date setting in the Publish meta box.
- *
- * @since 2.9.0
- * @since 4.4.0 Added the `$post` parameter.
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
- do_action( 'post_submitbox_misc_actions', $post );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="clear"></div>
</ins><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="clear"></div>
-</div>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="major-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,53 +328,55 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'post_submitbox_start', $post );
</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="delete-action">
- <?php
- if ( current_user_can( 'delete_post', $post->ID ) ) {
- if ( ! EMPTY_TRASH_DAYS ) {
- $delete_text = __( 'Delete Permanently' );
- } else {
- $delete_text = __( 'Move to Trash' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="delete-action">
+ <?php
+ if ( current_user_can( 'delete_post', $post_id ) ) {
+ if ( ! EMPTY_TRASH_DAYS ) {
+ $delete_text = __( 'Delete Permanently' );
+ } else {
+ $delete_text = __( 'Move to Trash' );
+ }
+ ?>
+ <a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post_id ); ?>"><?php echo $delete_text; ?></a>
+ <?php
</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">-<a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post->ID ); ?>"><?php echo $delete_text; ?></a>
- <?php
- }
- ?>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</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="publishing-action">
-<span class="spinner"></span>
- <?php
- if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ), true ) || 0 == $post->ID ) {
- if ( $can_publish ) :
- if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="publishing-action">
+ <span class="spinner"></span>
+ <?php
+ if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ), true ) || 0 === $post_id ) {
+ if ( $can_publish ) :
+ if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
+ ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php echo esc_attr_x( 'Schedule', 'post action/button label' ); ?>" />
+ <?php submit_button( _x( 'Schedule', 'post action/button label' ), 'primary large', 'publish', false ); ?>
+ <?php
+ else :
+ ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Publish' ); ?>" />
+ <?php submit_button( __( 'Publish' ), 'primary large', 'publish', false ); ?>
+ <?php
+ endif;
+ 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">- <input name="original_publish" type="hidden" id="original_publish" value="<?php echo esc_attr_x( 'Schedule', 'post action/button label' ); ?>" />
- <?php submit_button( _x( 'Schedule', 'post action/button label' ), 'primary large', 'publish', false ); ?>
- <?php else : ?>
- <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Publish' ); ?>" />
- <?php submit_button( __( 'Publish' ), 'primary large', 'publish', false ); ?>
- <?php
- endif;
- else :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Submit for Review' ); ?>" />
+ <?php submit_button( __( 'Submit for Review' ), 'primary large', 'publish', false ); ?>
+ <?php
+ endif;
+ } else {
+ ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Update' ); ?>" />
+ <?php submit_button( __( 'Update' ), 'primary large', 'save', false, array( 'id' => 'publish' ) ); ?>
+ <?php
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Submit for Review' ); ?>" />
- <?php submit_button( __( 'Submit for Review' ), 'primary large', 'publish', false ); ?>
- <?php
- endif;
- } else {
- ?>
- <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Update' ); ?>" />
- <input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ); ?>" />
- <?php
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
+ <div class="clear"></div>
</ins><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="clear"></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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>
-
</del><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>
</div>
</body>
</html>