WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@18234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2011-06-10 17:02:03 +00:00
parent b9f0a71e1d
commit 856c2742ca
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/edit-form-advanced.php
View File

@ -241,12 +241,12 @@ $side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
</div> </div>
<div class="inside"> <div class="inside">
<?php <?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'); $shortlink = wp_get_shortlink($post->ID, 'post');
if ( !empty($shortlink) ) 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>'; $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"> <div id="edit-slug-box">
<?php <?php
if ( ! empty($post->ID) && ! empty($sample_permalink_html) && 'auto-draft' != $post->post_status ) if ( ! empty($post->ID) && ! empty($sample_permalink_html) && 'auto-draft' != $post->post_status )

2
wp-admin/includes/class-wp-posts-list-table.php
View File

@ -550,7 +550,7 @@ class WP_Posts_List_Table extends WP_List_Table {
if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS ) if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
$actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this item permanently' ) ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>"; $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 ( in_array( $post->post_status, array( 'pending', 'draft' ) ) ) {
if ( $can_edit_post ) if ( $can_edit_post )
$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>'; $actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';

2
wp-admin/includes/internal-linking.php
View File

@ -16,7 +16,7 @@
* @return array Results. * @return array Results.
*/ */
function wp_link_query( $args = array() ) { 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 ); $pt_names = array_keys( $pts );
$query = array( $query = array(

3
wp-includes/post.php
View File

@ -31,6 +31,7 @@ function create_initial_post_types() {
register_post_type( 'page', array( register_post_type( 'page', array(
'public' => true, 'public' => true,
'publicly_queryable' => false,
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */ '_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. */ '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
'capability_type' => 'page', 'capability_type' => 'page',
@ -4204,7 +4205,7 @@ function _get_last_post_time( $timezone, $field ) {
if ( !$date ) { if ( !$date ) {
$add_seconds_server = date('Z'); $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' ) ); array_walk( $post_types, array( &$wpdb, 'escape_by_ref' ) );
$post_types = "'" . implode( "', '", $post_types ) . "'"; $post_types = "'" . implode( "', '", $post_types ) . "'";