Changeset 33666

Timestamp:

08/20/2015 07:39:57 PM (9 years ago)

Author:

wonderboymusic

Message:

Custom Post Types:

• Introduce is_post_type_viewable( $post_type_object )
• Separate the HTML bits from the translatable bits in the post messages array in edit-form-advanced.php
• Don't show certain UI pieces when a post is not viewable on the front end

When a custom post type item is not viewable on the front end, we don't want to show links to View it (on the front end) all over the admin. We also want to hide the Preview link, et al. We also want our admin messages to not contain said links.

Custom post types with public_queryable set to false are not viewable on the front end.
'page' is viewable on the front end, but 'page' is a _builtin type, and public_queryable is set to false when it is registered - see WP::parse_request() for when public_queryable gets used.

This is confusing, but also somewhat straightforward: to determine if a post type is viewable on the front end, we can check one way for _builtin => true and another way for _builtin => false:

$post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public )

If a post type is publicly_queryable, it's viewable. If that value is false, it is viewable if it's a _builtin type that is also public.

I am in search of edge cases, so this shall land.

Props wonderboymusic, DrewAPicture.
See #17609.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (4 diffs)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

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

@@ -85 +85 @@
 $post_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
 
+$preview_link_html = $scheduled_link_html = $view_post_html = '';
+
+$viewable = is_post_type_viewable( $post_type_object );
+
+if ( $viewable ) {
+    // Preview link.
+    $preview_link_html = sprintf( ' <a target="_blank" href="%s">%s</a>',
+        esc_url( $post_preview_url ),
+        __( 'Preview post' )
+    );
+
+    // Scheduled preview link.
+    $scheduled_link_html = sprintf( ' <a target="_blank" href="%s">%s</a>',
+        esc_url( $permalink ),
+        __( 'Preview post' )
+    );
+
+    // View post link.
+    $view_post_html = 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.'),
@@ -93 +119 @@
     /* 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,
 );
 
@@ -509 +533 @@
 <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');
@@ -526 +551 @@
 <?php
 }
+endif;
 ?>
 </div>

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

@@ -1073 +1073 @@
         }
 
-        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' ) ) ) {

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

@@ -32 +32 @@
 <?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 ) : ?>
+</div>
+<?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
 <div id="preview-action">
 <?php

trunk/src/wp-includes/post.php

@@ -1845 +1845 @@
 
 /**
+ * Determines whether a post type is considered "viewable".
+ *
+ * For built-in post types such as posts and pages, the 'public' value will be evaluated.
+ * For all others, the 'publicly_queryable' value will be used.
+ *
+ * @since 4.4.0
+ *
+ * @param object $post_type_object Post type object.
+ * @return bool Whether the post type should be considered viewable.
+ */
+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.
  *