diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/meta-boxes.php --- a/wp/wp-admin/includes/meta-boxes.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/includes/meta-boxes.php Mon Oct 14 18:28:13 2019 +0200 @@ -22,208 +22,228 @@ function post_submit_meta_box( $post, $args = array() ) { global $action; - $post_type = $post->post_type; - $post_type_object = get_post_type_object($post_type); - $can_publish = current_user_can($post_type_object->cap->publish_posts); -?> + $post_type = $post->post_type; + $post_type_object = get_post_type_object( $post_type ); + $can_publish = current_user_can( $post_type_object->cap->publish_posts ); + ?>
- +
- +
-post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?> -post_status ) { ?>style="display:none" type="submit" name="save" id="save-post" value="" class="button" /> + post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { + $private_style = ''; + if ( 'private' == $post->post_status ) { + $private_style = 'style="display:none"'; + } + ?> + type="submit" name="save" id="save-post" value="" class="button" /> post_status && $can_publish ) { ?> - +
- +
-post_status ) { - $preview_button_text = __( 'Preview Changes' ); -} else { - $preview_button_text = __( 'Preview' ); -} + post_status ) { + $preview_button_text = __( 'Preview Changes' ); + } else { + $preview_button_text = __( 'Preview' ); + } -$preview_button = sprintf( '%1$s %2$s', - $preview_button_text, - /* translators: accessibility text */ - __( '(opens in a new window)' ) -); -?> + $preview_button = sprintf( + '%1$s %2$s', + $preview_button_text, + /* translators: accessibility text */ + __( '(opens in a new tab)' ) + ); + ?>
- +
- + 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; -} -?> + 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; + } + ?> -post_status || 'private' == $post->post_status || $can_publish ) { ?> -post_status ) { ?>style="display:none;" class="edit-post-status hide-if-no-js" role="button"> + post_status || 'private' == $post->post_status || $can_publish ) { + $private_style = ''; + if ( 'private' == $post->post_status ) { + $private_style = 'style="display:none"'; + } + ?> + class="edit-post-status hide-if-no-js" role="button">
- - + + - - + +
- + post_status ) { - $post->post_password = ''; - $visibility = 'private'; - $visibility_trans = __('Private'); -} elseif ( !empty( $post->post_password ) ) { - $visibility = 'password'; - $visibility_trans = __('Password protected'); -} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) { - $visibility = 'public'; - $visibility_trans = __('Public, Sticky'); -} else { - $visibility = 'public'; - $visibility_trans = __('Public'); -} + 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_type == 'post' && is_sticky( $post->ID ) ) { + $visibility = 'public'; + $visibility_trans = __( 'Public, Sticky' ); + } else { + $visibility = 'public'; + $visibility_trans = __( 'Public' ); + } -echo esc_html( $visibility_trans ); ?> - + echo esc_html( $visibility_trans ); + ?> + +
- - -ID)); ?> /> + + +ID ) ); ?> /> - />
- + />
+ ID ) ); ?> />
- />
-
- />
+ />
+
+ />

- - + +

-ID ) { - if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date - /* translators: Post date information. 1: Date on which the post is currently scheduled to be published */ - $stamp = __('Scheduled for: %1$s'); - } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published - /* translators: Post date information. 1: Date on which the post was published */ - $stamp = __('Published on: %1$s'); - } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified - $stamp = __('Publish immediately'); - } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified - /* translators: Post date information. 1: Date on which the post is to be published */ - $stamp = __('Schedule for: %1$s'); - } else { // draft, 1 or more saves, date specified - /* translators: Post date information. 1: Date on which the post is to be published */ - $stamp = __('Publish on: %1$s'); + 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 immediately' ); + } 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 = date_i18n( $datef, strtotime( $post->post_date ) ); + } else { // draft (no saves, and thus no date specified) + $stamp = __( 'Publish immediately' ); + $date = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) ); } - $date = date_i18n( $datef, strtotime( $post->post_date ) ); -} else { // draft (no saves, and thus no date specified) - $stamp = __('Publish immediately'); - $date = date_i18n( $datef, strtotime( current_time('mysql') ) ); -} -if ( ! empty( $args['args']['revisions_count'] ) ) : ?> + if ( ! empty( $args['args']['revisions_count'] ) ) : + ?>
- ' . number_format_i18n( $args['args']['revisions_count'] ) . '' ); - ?> + ?>
- + if ( $can_publish ) : // Contributors don't get to choose the date of publish + ?>
- +
- +
-post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?> + post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?>

- + - +
- +
-ID ) ) { - if ( !EMPTY_TRASH_DAYS ) - $delete_text = __('Delete Permanently'); - else - $delete_text = __('Move to Trash'); + ID ) ) { + if ( ! EMPTY_TRASH_DAYS ) { + $delete_text = __( 'Delete Permanently' ); + } else { + $delete_text = __( 'Move to Trash' ); + } + ?> + + -
-post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { - if ( $can_publish ) : - if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?> + post_status, array( 'publish', 'future', 'private' ) ) || 0 == $post->ID ) { + if ( $can_publish ) : + if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : + ?> - - - + + + - - - - - - - + else : + ?> + + + + + +
- + ?>
- +
- +
- + post_date ) ); - printf( - /* translators: Attachment information. %s: Date the attachment was uploaded */ - __( 'Uploaded on: %s' ), - '' . $date . '' - ); - ?> + printf( + /* translators: Attachment information. %s: Date the attachment was uploaded */ + __( 'Uploaded on: %s' ), + '' . $date . '' + ); + ?> +
@@ -367,27 +397,28 @@
ID ) ) + if ( current_user_can( 'delete_post', $post->ID ) ) { if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - echo "" . _x( 'Trash', 'verb' ) . ""; + echo "" . __( 'Move to Trash' ) . ''; } else { $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; - echo "" . __( 'Delete Permanently' ) . ""; + echo "" . __( 'Delete Permanently' ) . ''; } + } ?>
- - + +
-post_type, 'post-formats' ) ) : - $post_formats = get_theme_support( 'post-formats' ); + $post_formats = get_theme_support( 'post-formats' ); - if ( is_array( $post_formats[0] ) ) : - $post_format = get_post_format( $post->ID ); - if ( !$post_format ) - $post_format = '0'; - // Add in the current one if it isn't there yet, in case the current theme doesn't support it - if ( $post_format && !in_array( $post_format, $post_formats[0] ) ) - $post_formats[0][] = $post_format; - ?> -
+ if ( is_array( $post_formats[0] ) ) : + $post_format = get_post_format( $post->ID ); + if ( ! $post_format ) { + $post_format = '0'; + } + // Add in the current one if it isn't there yet, in case the current theme doesn't support it + if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) { + $post_formats[0][] = $post_format; + } + ?> +
/> @@ -426,7 +459,9 @@
- cap->assign_terms ); - $comma = _x( ',', 'tag delimiter' ); - $terms_to_edit = get_terms_to_edit( $post->ID, $tax_name ); + $comma = _x( ',', 'tag delimiter' ); + $terms_to_edit = get_terms_to_edit( $post->ID, $tax_name ); if ( ! is_string( $terms_to_edit ) ) { $terms_to_edit = ''; } -?> + ?>

- +
-

-

+ +

labels->separate_items_with_commas; ?>

- +

labels->no_terms; ?>

    - +

    - @@ -542,7 +577,15 @@ echo ""; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks. ?>
      - ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?> + ID, + array( + 'taxonomy' => $tax_name, + 'popular_cats' => $popular_ids, + ) + ); + ?>
    cap->edit_terms ) ) : ?> @@ -614,17 +657,19 @@ * * @param object $post */ -function post_excerpt_meta_box($post) { -?> - -

    + +

    + Learn more about manual excerpts.' ), __( 'https://codex.wordpress.org/Excerpt' ) ); -?>

    - +

    + to_ping ) ) . '" aria-describedby="trackback-url-desc" />'; - if ('' != $post->pinged) { - $pings = '

    '. __('Already pinged:') . '