Changeset 18234

Timestamp:

06/10/2011 05:02:03 PM (13 years ago)

Author:

markjaquith

Message:

Fix mistaken use of publicly_queryable when public was what was intended. props nacin. fixes #17040

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/internal-linking.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)

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

@@ -242 +242 @@
 <div class="inside">
 <?php
-$sample_permalink_html = ! empty( $post_type_object->publicly_queryable ) ? 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) )
     $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
 
-if ( ! empty( $post_type_object->publicly_queryable ) && ! ( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>
+if ( $post_type_object->public && ! ( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>
     <div id="edit-slug-box">
     <?php

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

@@ -551 +551 @@
                         $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->publicly_queryable ) {
+                if ( $post_type_object->public ) {
                     if ( in_array( $post->post_status, array( 'pending', 'draft' ) ) ) {
                         if ( $can_edit_post )

trunk/wp-admin/includes/internal-linking.php

@@ -17 +17 @@
  */
 function wp_link_query( $args = array() ) {
-    $pts = get_post_types( array( 'publicly_queryable' => true ), 'objects' );
+    $pts = get_post_types( array( 'public' => true ), 'objects' );
     $pt_names = array_keys( $pts );
 

trunk/wp-includes/post.php

@@ -32 +32 @@
     register_post_type( 'page', array(
         'public' => true,
+        'publicly_queryable' => false,
         '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
         '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
@@ -4205 +4206 @@
         $add_seconds_server = date('Z');
 
-        $post_types = get_post_types( array( 'publicly_queryable' => true ) );
+        $post_types = get_post_types( array( 'public' => true ) );
         array_walk( $post_types, array( &$wpdb, 'escape_by_ref' ) );
         $post_types = "'" . implode( "', '", $post_types ) . "'";