Ticket #17609: 17609.3.diff

src/wp-admin/edit-form-advanced.php

@@ -84 +84 @@
 /** 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 );
 
+$viewable = is_post_type_viewable( $post_type_object );
+$preview_link_html = $viewable ? sprintf(
+        ' <a target="_blank" href="%s">%s</a>',
+        esc_url( $post_preview_url ),
+        __( 'Preview post' )
+) : '';
+$scheduled_link_html = $viewable ? sprintf(
+        ' <a target="_blank" href="%s">%s</a>',
+        esc_url( $permalink ),
+        __( 'Preview post' )
+) : '';
+$view_post_html = $viewable ? sprintf(
+        ' <a href="%s">">%</a>',
+        esc_url( $permalink ),
+        __( 'View post' )
+) : '';
+/* translators: Publish box date format, see http://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.
-         1 => sprintf( __('Post updated. <a href="%s">View post</a>'), esc_url( $permalink ) ),
+         1 => __('Post updated.') . $view_post_html,
          2 => __('Custom field updated.'),
          3 => __('Custom field deleted.'),
          4 => __('Post updated.'),
         /* 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 ) ),
+         6 => __('Post published.') . $view_post_html,
          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 ) ),
+         8 => __('Post submitted.') . $preview_link_html,
+         9 => sprintf( __('Post scheduled for: <strong>%1$s</strong>'), $scheduled_date ) . $scheduled_link_html,
+        10 => __('Post draft updated.') . $preview_link_html,
 );
 
 /** This filter is documented in wp-admin/includes/meta-boxes.php */
@@ -508 +524 @@
 ?>
 <div class="inside">
 <?php
+if ( $viewable ):
 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 $shortlink = wp_get_shortlink($post->ID, 'post');
 
@@ -525 +542 @@
         </div>
 <?php
 }
+endif;
 ?>
 </div>
 <?php

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -1072 +1072 @@
                                 $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
                 }
 
-                if ( $post_type_object->public ) {
+                if ( is_post_type_viewable( $post_type_object ) ) {
                         $title = _draft_or_post_title();
                         if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
                                 if ( $can_edit_post ) {

src/wp-admin/includes/meta-boxes.php

@@ -31 +31 @@
 <div id="save-action">
 <?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
 <input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
+<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 } ?>
-<span class="spinner"></span>
 </div>
-<?php if ( $post_type_object->public ) : ?>
+<?php
+if ( is_post_type_viewable( $post_type_object ) ) : ?>
 <div id="preview-action">
 <?php
 if ( 'publish' == $post->post_status ) {

src/wp-includes/post.php

@@ -1844 +1844 @@
 }
 
 /**
+ * @since 4.4.0
+ *
+ * @param object $post_type_object
+ * @return bool
+ */
+function is_post_type_viewable( $post_type_object ) {
+        return $post_type_object->publicly_queryable || ( $post_type_object->_builtin && $post_type_object->public );
+}
+
+/**
  * Retrieve list of latest posts or posts matching criteria.
  *
  * The defaults are as follows: