Ticket #33763: 33763.3.diff

src/wp-includes/admin-bar.php

@@ -593 +593 @@
                 if ( ! empty( $current_object->post_type )
                         && ( $post_type_object = get_post_type_object( $current_object->post_type ) )
                         && current_user_can( 'edit_post', $current_object->ID )
-                        && $post_type_object->show_ui && $post_type_object->show_in_admin_bar
+                        && $post_type_object->show_in_admin_bar
                         && $edit_post_link = get_edit_post_link( $current_object->ID ) )
                 {
                         $wp_admin_bar->add_menu( array(
@@ -604 +604 @@
                 } elseif ( ! empty( $current_object->taxonomy )
                         && ( $tax = get_taxonomy( $current_object->taxonomy ) )
                         && current_user_can( $tax->cap->edit_terms )
-                        && $tax->show_ui
                         && $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
                 {
                         $wp_admin_bar->add_menu( array(

src/wp-includes/link-template.php

@@ -937 +937 @@
                 $args['post_type'] = reset( $tax->object_type );
         }
 
-        $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) );
+        if ( $tax->show_ui ) {
+                $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) );
+        } else {
+                $location = '';
+        }
 
         /**
          * Filter the edit link for a term.
@@ -1254 +1258 @@
         if ( !current_user_can( 'edit_post', $post->ID ) )
                 return;
 
-        $allowed = array_merge( array(
-                'revision',
-        ), get_post_types( array(
-                'show_ui' => true,
-        ) ) );
-
-        if ( ! in_array( $post->post_type, $allowed ) ) {
-                return;
+        if ( $post_type_object->_edit_link ) {
+                $link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
+        } else {
+                $link = '';
         }
 
         /**
@@ -1274 +1274 @@
          * @param string $context The link context. If set to 'display' then ampersands
          *                        are encoded.
          */
-        return apply_filters( 'get_edit_post_link', admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) ), $post->ID, $context );
+        return apply_filters( 'get_edit_post_link', $link, $post->ID, $context );
 }
 
 /**

src/wp-includes/post-functions.php

@@ -1012 +1012 @@
          */
         $args = apply_filters( 'register_post_type_args', $args, $post_type );
 
+        $has_edit_link = ! empty( $args['_edit_link'] );
+
         // Args prefixed with an underscore are reserved for internal use.
         $defaults = array(
                 'labels'               => array(),
@@ -1082 +1084 @@
         if ( null === $args->map_meta_cap )
                 $args->map_meta_cap = false;
 
+        // If there's no specified edit link and no UI, remove the edit link.
+        if ( ! $args->show_ui && ! $has_edit_link ) {
+                $args->_edit_link = '';
+        }
+
         $args->cap = get_post_type_capabilities( $args );
         unset( $args->capabilities );