WordPress 4.7.2-scripts

[autoinstalls/wordpress.git] / wp-admin / edit-form-advanced.php

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 2a963f1c19a32c413e9d93acceace607c6a6af03..803300f40d0220cfc6edd6b090a8683e871cf489 100644 (file)
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -11,9 +11,9 @@ if ( !defined('ABSPATH') )
        die('-1');
 
 /**
        die('-1');
 
 /**

- * @global string  $post_type
- * @global object  $post_type_object
- * @global WP_Post $post
+ * @global string       $post_type
+ * @global WP_Post_Type $post_type_object
+ * @global WP_Post      $post

  */
 global $post_type, $post_type_object, $post;
 
  */
 global $post_type, $post_type_object, $post;
 


@@ -21,7 +21,7 @@ wp_enqueue_script('post');
 $_wp_editor_expand = $_content_editor_dfw = false;
 
 /**
 $_wp_editor_expand = $_content_editor_dfw = false;
 
 /**

- * Filter whether to enable the 'expand' functionality in the post editor.
+ * Filters whether to enable the 'expand' functionality in the post editor.

  *
  * @since 4.0.0
  * @since 4.1.0 Added the `$post_type` parameter.
  *
  * @since 4.0.0
  * @since 4.1.0 Added the `$post_type` parameter.


@@ -81,46 +81,89 @@ if ( ! $permalink ) {
 }
 
 $messages = array();
 }
 
 $messages = array();

-/** This filter is documented in wp-admin/includes/meta-boxes.php */
-$post_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
+
+$preview_post_link_html = $scheduled_post_link_html = $view_post_link_html = '';
+$preview_page_link_html = $scheduled_page_link_html = $view_page_link_html = '';
+
+$preview_url = get_preview_post_link( $post );
+
+$viewable = is_post_type_viewable( $post_type_object );
+
+if ( $viewable ) {
+
+       // Preview post link.
+       $preview_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+               esc_url( $preview_url ),
+               __( 'Preview post' )
+       );
+
+       // Scheduled post preview link.
+       $scheduled_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+               esc_url( $permalink ),
+               __( 'Preview post' )
+       );
+
+       // View post link.
+       $view_post_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
+               esc_url( $permalink ),
+               __( 'View post' )
+       );
+
+       // Preview page link.
+       $preview_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+               esc_url( $preview_url ),
+               __( 'Preview page' )
+       );
+
+       // Scheduled page preview link.
+       $scheduled_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+               esc_url( $permalink ),
+               __( 'Preview page' )
+       );
+
+       // View page link.
+       $view_page_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
+               esc_url( $permalink ),
+               __( 'View page' )
+       );
+
+}
+
+/* translators: Publish box date format, see https://secure.php.net/date */
+$scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );

 
 $messages['post'] = array(
         0 => '', // Unused. Messages start at index 1.
 
 $messages['post'] = array(
         0 => '', // Unused. Messages start at index 1.

-        1 => sprintf( __('Post updated. <a href="%s">View post</a>'), esc_url( $permalink ) ),
-        2 => __('Custom field updated.'),
-        3 => __('Custom field deleted.'),
-        4 => __('Post updated.'),
+        1 => __( 'Post updated.' ) . $view_post_link_html,
+        2 => __( 'Custom field updated.' ),
+        3 => __( 'Custom field deleted.' ),
+        4 => __( 'Post updated.' ),

        /* translators: %s: date and time of the revision */
        /* translators: %s: date and time of the revision */

-        5 => isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-        6 => sprintf( __('Post published. <a href="%s">View post</a>'), esc_url( $permalink ) ),
-        7 => __('Post saved.'),
-        8 => sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), esc_url( $post_preview_url ) ),
-        9 => sprintf( __('Post scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview post</a>'),
-               /* translators: Publish box date format, see http://php.net/date */
-               date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) ), esc_url( $permalink ) ),
-       10 => sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), esc_url( $post_preview_url ) ),
+        5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+        6 => __( 'Post published.' ) . $view_post_link_html,
+        7 => __( 'Post saved.' ),
+        8 => __( 'Post submitted.' ) . $preview_post_link_html,
+        9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
+       10 => __( 'Post draft updated.' ) . $preview_post_link_html,

 );
 );

-
-/** This filter is documented in wp-admin/includes/meta-boxes.php */
-$page_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
-

 $messages['page'] = array(
         0 => '', // Unused. Messages start at index 1.
 $messages['page'] = array(
         0 => '', // Unused. Messages start at index 1.

-        1 => sprintf( __('Page updated. <a href="%s">View page</a>'), esc_url( $permalink ) ),
-        2 => __('Custom field updated.'),
-        3 => __('Custom field deleted.'),
-        4 => __('Page updated.'),
-        5 => isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-        6 => sprintf( __('Page published. <a href="%s">View page</a>'), esc_url( $permalink ) ),
-        7 => __('Page saved.'),
-        8 => sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), esc_url( $page_preview_url ) ),
-        9 => sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) ), esc_url( $permalink ) ),
-       10 => sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), esc_url( $page_preview_url ) ),
+        1 => __( 'Page updated.' ) . $view_page_link_html,
+        2 => __( 'Custom field updated.' ),
+        3 => __( 'Custom field deleted.' ),
+        4 => __( 'Page updated.' ),
+       /* translators: %s: date and time of the revision */
+        5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+        6 => __( 'Page published.' ) . $view_page_link_html,
+        7 => __( 'Page saved.' ),
+        8 => __( 'Page submitted.' ) . $preview_page_link_html,
+        9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
+       10 => __( 'Page draft updated.' ) . $preview_page_link_html,

 );
 );

-$messages['attachment'] = array_fill( 1, 10, __( 'Media attachment updated.' ) ); // Hack, for now.
+$messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now.

 
 /**
 
 /**

- * Filter the post updated messages.
+ * Filters the post updated messages.

  *
  * @since 3.0.0
  *
  *
  * @since 3.0.0
  *


@@ -154,7 +197,7 @@ $form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_
 
 // Detect if there exists an autosave newer than the post and if that autosave is different than the post
 if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
 
 // Detect if there exists an autosave newer than the post and if that autosave is different than the post
 if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {

-       foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
+       foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) {

                if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
                        $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
                        break;
                if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
                        $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
                        break;


@@ -176,7 +219,7 @@ $publish_callback_args = null;
 if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) {
        $revisions = wp_get_post_revisions( $post_ID );
 
 if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) {
        $revisions = wp_get_post_revisions( $post_ID );
 

-       // We should aim to show the revisions metabox only when there are revisions.
+       // We should aim to show the revisions meta box only when there are revisions.

        if ( count( $revisions ) > 1 ) {
                reset( $revisions ); // Reset pointer for key()
                $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) );
        if ( count( $revisions ) > 1 ) {
                reset( $revisions ); // Reset pointer for key()
                $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) );


@@ -216,8 +259,9 @@ foreach ( get_object_taxonomies( $post ) as $tax_name ) {
        add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
 }
 
        add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
 }
 

-if ( post_type_supports($post_type, 'page-attributes') )
-       add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
+if ( post_type_supports( $post_type, 'page-attributes' ) || count( get_page_templates( $post ) ) > 0 ) {
+       add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core' );
+}

 
 if ( $thumbnail_support && current_user_can( 'upload_files' ) )
        add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low');
 
 if ( $thumbnail_support && current_user_can( 'upload_files' ) )
        add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low');


@@ -241,11 +285,25 @@ if ( post_type_supports($post_type, 'custom-fields') )
  */
 do_action( 'dbx_post_advanced', $post );
 
  */
 do_action( 'dbx_post_advanced', $post );
 

-if ( post_type_supports($post_type, 'comments') )
-       add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
+// Allow the Discussion meta box to show up if the post type supports comments,
+// or if comments or pings are open.
+if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) {
+       add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core' );
+}
+
+$stati = get_post_stati( array( 'public' => true ) );
+if ( empty( $stati ) ) {
+       $stati = array( 'publish' );
+}
+$stati[] = 'private';

 
 

-if ( ( 'publish' == get_post_status( $post ) || 'private' == get_post_status( $post ) ) && post_type_supports($post_type, 'comments') )
-       add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
+if ( in_array( get_post_status( $post ), $stati ) ) {
+       // If the post type support comments, or the post has comments, allow the
+       // Comments meta box.
+       if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
+               add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core' );
+       }
+}

 
 if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
        add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
 
 if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
        add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');


@@ -274,7 +332,7 @@ do_action( 'add_meta_boxes', $post_type, $post );
  *
  * @param WP_Post $post Post object.
  */
  *
  * @param WP_Post $post Post object.
  */

-do_action( 'add_meta_boxes_' . $post_type, $post );
+do_action( "add_meta_boxes_{$post_type}", $post );

 
 /**
  * Fires after meta boxes have been added.
 
 /**
  * Fires after meta boxes have been added.


@@ -304,10 +362,10 @@ if ( 'post' == $post_type ) {
                'content' => $customize_display,
        ) );
 
                'content' => $customize_display,
        ) );
 

-       $title_and_editor  = '<p>' . __('<strong>Title</strong> - Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>';
-       $title_and_editor .= '<p>' . __( '<strong>Post editor</strong> - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.' ) . '</p>';
-       $title_and_editor .= '<p>' . __( 'Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. ') . '</p>';
-       $title_and_editor .= '<p>' . __( 'The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically.' ) . '</p>';
+       $title_and_editor  = '<p>' . __('<strong>Title</strong> &mdash; Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>';
+       $title_and_editor .= '<p>' . __( '<strong>Post editor</strong> &mdash; Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.' ) . '</p>';
+       $title_and_editor .= '<p>' . __( 'Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.' ) . '</p>';
+       $title_and_editor .= '<p>' . __( 'The Text mode allows you to enter HTML along with your post text. Note that &lt;p&gt; and &lt;br&gt; tags are converted to line breaks when switching to the Text editor to make it less cluttered. When you type, a single line break can be used instead of typing &lt;br&gt;, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.' ) . '</p>';

        $title_and_editor .= '<p>' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
        $title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
        $title_and_editor .= '<p>' . __( 'Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.' ) . '</p>';
        $title_and_editor .= '<p>' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
        $title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
        $title_and_editor .= '<p>' . __( 'Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.' ) . '</p>';


@@ -321,12 +379,12 @@ if ( 'post' == $post_type ) {
        get_current_screen()->set_help_sidebar(
                        '<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'tools.php') . '</p>' .
                        '<p><strong>' . __('For more information:') . '</strong></p>' .
        get_current_screen()->set_help_sidebar(
                        '<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'tools.php') . '</p>' .
                        '<p><strong>' . __('For more information:') . '</strong></p>' .

-                       '<p>' . __('<a href="https://codex.wordpress.org/Posts_Add_New_Screen" target="_blank">Documentation on Writing and Editing Posts</a>') . '</p>' .
-                       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+                       '<p>' . __('<a href="https://codex.wordpress.org/Posts_Add_New_Screen">Documentation on Writing and Editing Posts</a>') . '</p>' .
+                       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'

        );
 } elseif ( 'page' == $post_type ) {
        $about_pages = '<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>' .
        );
 } elseif ( 'page' == $post_type ) {
        $about_pages = '<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>' .

-               '<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>';
+               '<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.') . '</p>';

 
        get_current_screen()->add_help_tab( array(
                'id'      => 'about-pages',
 
        get_current_screen()->add_help_tab( array(
                'id'      => 'about-pages',


@@ -336,9 +394,9 @@ if ( 'post' == $post_type ) {
 
        get_current_screen()->set_help_sidebar(
                        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
        get_current_screen()->set_help_sidebar(
                        '<p><strong>' . __('For more information:') . '</strong></p>' .

-                       '<p>' . __('<a href="https://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .
-                       '<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages" target="_blank">Documentation on Editing Pages</a>') . '</p>' .
-                       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+                       '<p>' . __('<a href="https://codex.wordpress.org/Pages_Add_New_Screen">Documentation on Adding New Pages</a>') . '</p>' .
+                       '<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages">Documentation on Editing Pages</a>') . '</p>' .
+                       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'

        );
 } elseif ( 'attachment' == $post_type ) {
        get_current_screen()->add_help_tab( array(
        );
 } elseif ( 'attachment' == $post_type ) {
        get_current_screen()->add_help_tab( array(


@@ -353,8 +411,8 @@ if ( 'post' == $post_type ) {
 
        get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
        get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
-       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'

        );
 }
 
        );
 }
 


@@ -371,15 +429,17 @@ if ( 'post' == $post_type || 'page' == $post_type ) {
 
 if ( 'post' == $post_type ) {
        $publish_box = '<p>' . __('Several boxes on this screen contain settings for how your content will be published, including:') . '</p>';
 
 if ( 'post' == $post_type ) {
        $publish_box = '<p>' . __('Several boxes on this screen contain settings for how your content will be published, including:') . '</p>';

-       $publish_box .= '<ul><li>' . __('<strong>Publish</strong> - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.') . '</li>';
+       $publish_box .= '<ul><li>' .
+               __( '<strong>Publish</strong> &mdash; You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.' ) .
+       '</li>';

 
        if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) {
 
        if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) {

-               $publish_box .= '<li>' . __( '<strong>Format</strong> - Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="https://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.' ) . '</li>';
+               $publish_box .= '<li>' . __( '<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="https://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.' ) . '</li>';

        }
 
        if ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
                /* translators: %s: Featured Image */
        }
 
        if ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
                /* translators: %s: Featured Image */

-               $publish_box .= '<li>' . sprintf( __( '<strong>%s</strong> - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '</li>';
+               $publish_box .= '<li>' . sprintf( __( '<strong>%s</strong> &mdash; This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '</li>';

        }
 
        $publish_box .= '</ul>';
        }
 
        $publish_box .= '</ul>';


@@ -390,8 +450,8 @@ if ( 'post' == $post_type ) {
                'content' => $publish_box,
        ) );
 
                'content' => $publish_box,
        ) );
 

-       $discussion_settings  = '<p>' . __('<strong>Send Trackbacks</strong> - Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>';
-       $discussion_settings .= '<p>' . __('<strong>Discussion</strong> - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>';
+       $discussion_settings  = '<p>' . __('<strong>Send Trackbacks</strong> &mdash; Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>';
+       $discussion_settings .= '<p>' . __('<strong>Discussion</strong> &mdash; You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>';

 
        get_current_screen()->add_help_tab( array(
                'id'      => 'discussion-settings',
 
        get_current_screen()->add_help_tab( array(
                'id'      => 'discussion-settings',


@@ -399,9 +459,9 @@ if ( 'post' == $post_type ) {
                'content' => $discussion_settings,
        ) );
 } elseif ( 'page' == $post_type ) {
                'content' => $discussion_settings,
        ) );
 } elseif ( 'page' == $post_type ) {

-       $page_attributes = '<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
-               '<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
-               '<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
+       $page_attributes = '<p>' . __('<strong>Parent</strong> &mdash; You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
+               '<p>' . __('<strong>Template</strong> &mdash; Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
+               '<p>' . __('<strong>Order</strong> &mdash; Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';

 
        get_current_screen()->add_help_tab( array(
                'id' => 'page-attributes',
 
        get_current_screen()->add_help_tab( array(
                'id' => 'page-attributes',


@@ -414,11 +474,18 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
 ?>
 
 <div class="wrap">

-<h1><?php
+<h1 class="wp-heading-inline"><?php

 echo esc_html( $title );
 echo esc_html( $title );

-if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
-       echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';

 ?></h1>
 ?></h1>

+
+<?php
+if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) {
+       echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+}
+?>
+
+<hr class="wp-header-end">
+

 <?php if ( $notice ) : ?>
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
 <?php endif; ?>
 <?php if ( $notice ) : ?>
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
 <?php endif; ?>


@@ -484,7 +551,7 @@ do_action( 'edit_form_top', $post ); ?>
 <div id="titlewrap">
        <?php
        /**
 <div id="titlewrap">
        <?php
        /**

-        * Filter the title field placeholder text.
+        * Filters the title field placeholder text.

         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *


@@ -508,11 +575,17 @@ do_action( 'edit_form_before_permalink', $post );
 ?>
 <div class="inside">
 <?php
 ?>
 <div class="inside">
 <?php

+if ( $viewable ) :

 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';

-$shortlink = wp_get_shortlink($post->ID, 'post');

 
 

-if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) )
-    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+// As of 4.4, the Get Shortlink button is hidden by default.
+if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+       $shortlink = wp_get_shortlink($post->ID, 'post');
+
+       if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) {
+       $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+       }
+}

 
 if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
        $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
 
 if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
        $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;


@@ -525,6 +598,7 @@ if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !
        </div>
 <?php
 }
        </div>
 <?php
 }

+endif;

 ?>
 </div>
 <?php
 ?>
 </div>
 <?php


@@ -558,16 +632,18 @@ if ( post_type_supports($post_type, 'editor') ) {
        ),
 ) ); ?>
 <table id="post-status-info"><tbody><tr>
        ),
 ) ); ?>
 <table id="post-status-info"><tbody><tr>

-       <td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
+       <td id="wp-word-count" class="hide-if-no-js"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>

        <td class="autosave-info">
        <span class="autosave-message">&nbsp;</span>
 <?php
        if ( 'auto-draft' != $post->post_status ) {
                echo '<span id="last-edit">';
                if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
        <td class="autosave-info">
        <span class="autosave-message">&nbsp;</span>
 <?php
        if ( 'auto-draft' != $post->post_status ) {
                echo '<span id="last-edit">';
                if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {

-                       printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+                       /* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
+                       printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );

                } else {
                } else {

-                       printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+                       /* translators: 1: Post edited date, 2: Post edited time */
+                       printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );

                }
                echo '</span>';
        } ?>
                }
                echo '</span>';
        } ?>