diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/includes/meta-boxes.php --- a/wp/wp-admin/includes/meta-boxes.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-admin/includes/meta-boxes.php Tue Dec 15 13:49:49 2020 +0100 @@ -1,6 +1,14 @@ ID; $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 ); @@ -30,252 +39,280 @@
- -
- -
+ +
+ +
+ +
+
+ post_status, array( 'publish', 'future', 'pending' ), true ) ) { + $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 && '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' ); - } + if ( is_post_type_viewable( $post_type_object ) ) : + ?> +
+ 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 tab)' ) - ); + $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; + } + ?> + -
- 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"> - 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 ) { - $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' === $post_type && is_sticky( $post_id ) ) { + $visibility = 'public'; + $visibility_trans = __( 'Public, Sticky' ); + } else { + $visibility = 'public'; + $visibility_trans = __( 'Public' ); + } - -
+ echo esc_html( $visibility_trans ); + ?> + -
- - + - 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 ); - ?> - - - + + />
+ + + />
+ + + />
+
-
- - -ID ) ); ?> /> - - - />
- -ID ) ); ?> />
- - />
-
- />
+ />
-

- - -

-
- +

+ + +

+
+ +
-
+ 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 + 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 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 = 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 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 = sprintf( + $date_string, + date_i18n( $date_format, strtotime( current_time( 'mysql' ) ) ), + date_i18n( $time_format, 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'] ) ) : + ?> +
+ ' . number_format_i18n( $args['args']['revisions_count'] ) . '' ); + ?> + +
+ +
+ + ' . $date . '' ); ?> + + + + + +
+ + +
+
+ -
- ' . number_format_i18n( $args['args']['revisions_count'] ) . '' ); - ?> - -
- post_status && get_post_meta( $post_id, '_customize_changeset_uuid', true ) ) : + ?> +
+

+ unpublished customization changes. 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' ) + ) + ) + ); + ?> +

+
+ -
- - - -
- - -
-
- - - post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?> -
-

- unpublished customization changes. 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' ) - ) - ) - ); - ?> -

- - - -
-
+
@@ -291,53 +328,55 @@ */ do_action( 'post_submitbox_start', $post ); ?> -
- ID ) ) { - if ( ! EMPTY_TRASH_DAYS ) { - $delete_text = __( 'Delete Permanently' ); - } else { - $delete_text = __( 'Move to Trash' ); +
+ + + - - +
+ +
+ + 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' ) ) : + ?> + + + + + + + + + + + 'publish' ) ); ?> + +
+
-
- - 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' ) ) : - ?> - - - - - - - - - - - -
-
-
-
- - +
@@ -363,18 +402,18 @@
- post_date ) + post_date ) ), + /* translators: Publish box time format, see https://www.php.net/date */ + date_i18n( _x( 'H:i', 'publish box time format' ), strtotime( $post->post_date ) ) ); - printf( - /* translators: Attachment information. %s: Date the attachment was uploaded */ - __( 'Uploaded on: %s' ), - '' . $date . '' - ); - ?> + /* translators: Attachment information. %s: Date the attachment was uploaded. */ + printf( __( 'Uploaded on: %s' ), '' . $uploaded_on . '' ); + ?>
@@ -402,7 +441,7 @@ echo "" . __( 'Move to Trash' ) . ''; } else { $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; - echo "" . __( 'Delete Permanently' ) . ''; + echo "" . __( 'Delete permanently' ) . ''; } } ?> @@ -445,8 +484,8 @@ 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] ) ) { + // 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], true ) ) { $post_formats[0][] = $post_format; } ?> @@ -492,9 +531,9 @@ } else { $args = $box['args']; } - $r = wp_parse_args( $args, $defaults ); - $tax_name = esc_attr( $r['taxonomy'] ); - $taxonomy = get_taxonomy( $r['taxonomy'] ); + $parsed_args = wp_parse_args( $args, $defaults ); + $tax_name = esc_attr( $parsed_args['taxonomy'] ); + $taxonomy = get_taxonomy( $parsed_args['taxonomy'] ); $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms ); $comma = _x( ',', 'tag delimiter' ); $terms_to_edit = get_terms_to_edit( $post->ID, $tax_name ); @@ -555,9 +594,9 @@ } else { $args = $box['args']; } - $r = wp_parse_args( $args, $defaults ); - $tax_name = esc_attr( $r['taxonomy'] ); - $taxonomy = get_taxonomy( $r['taxonomy'] ); + $parsed_args = wp_parse_args( $args, $defaults ); + $tax_name = esc_attr( $parsed_args['taxonomy'] ); + $taxonomy = get_taxonomy( $parsed_args['taxonomy'] ); ?>