Ticket #33763: 33763.3.diff
File 33763.3.diff, 3.1 KB (added by , 10 years ago) |
---|
-
src/wp-includes/admin-bar.php
593 593 if ( ! empty( $current_object->post_type ) 594 594 && ( $post_type_object = get_post_type_object( $current_object->post_type ) ) 595 595 && current_user_can( 'edit_post', $current_object->ID ) 596 && $post_type_object->show_ ui && $post_type_object->show_in_admin_bar596 && $post_type_object->show_in_admin_bar 597 597 && $edit_post_link = get_edit_post_link( $current_object->ID ) ) 598 598 { 599 599 $wp_admin_bar->add_menu( array( … … 604 604 } elseif ( ! empty( $current_object->taxonomy ) 605 605 && ( $tax = get_taxonomy( $current_object->taxonomy ) ) 606 606 && current_user_can( $tax->cap->edit_terms ) 607 && $tax->show_ui608 607 && $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) ) 609 608 { 610 609 $wp_admin_bar->add_menu( array( -
src/wp-includes/link-template.php
937 937 $args['post_type'] = reset( $tax->object_type ); 938 938 } 939 939 940 $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) ); 940 if ( $tax->show_ui ) { 941 $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) ); 942 } else { 943 $location = ''; 944 } 941 945 942 946 /** 943 947 * Filter the edit link for a term. … … 1254 1258 if ( !current_user_can( 'edit_post', $post->ID ) ) 1255 1259 return; 1256 1260 1257 $allowed = array_merge( array( 1258 'revision', 1259 ), get_post_types( array( 1260 'show_ui' => true, 1261 ) ) ); 1262 1263 if ( ! in_array( $post->post_type, $allowed ) ) { 1264 return; 1261 if ( $post_type_object->_edit_link ) { 1262 $link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) ); 1263 } else { 1264 $link = ''; 1265 1265 } 1266 1266 1267 1267 /** … … 1274 1274 * @param string $context The link context. If set to 'display' then ampersands 1275 1275 * are encoded. 1276 1276 */ 1277 return apply_filters( 'get_edit_post_link', admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) ), $post->ID, $context );1277 return apply_filters( 'get_edit_post_link', $link, $post->ID, $context ); 1278 1278 } 1279 1279 1280 1280 /** -
src/wp-includes/post-functions.php
1012 1012 */ 1013 1013 $args = apply_filters( 'register_post_type_args', $args, $post_type ); 1014 1014 1015 $has_edit_link = ! empty( $args['_edit_link'] ); 1016 1015 1017 // Args prefixed with an underscore are reserved for internal use. 1016 1018 $defaults = array( 1017 1019 'labels' => array(), … … 1082 1084 if ( null === $args->map_meta_cap ) 1083 1085 $args->map_meta_cap = false; 1084 1086 1087 // If there's no specified edit link and no UI, remove the edit link. 1088 if ( ! $args->show_ui && ! $has_edit_link ) { 1089 $args->_edit_link = ''; 1090 } 1091 1085 1092 $args->cap = get_post_type_capabilities( $args ); 1086 1093 unset( $args->capabilities ); 1087 1094