Changeset 35704

Timestamp:

11/19/2015 04:24:35 PM (8 years ago)

Author:

johnbillion

Message:

Move the show_ui logic into the get_edit_post_link() and get_edit_term_link() functions to facilitate post types and terms which specify show_ui as false but provide a custom editing UI via the get_edit_post_link and get_edit_term_link filters.

Fixes #33763
Fixes #33938

Location:

trunk/src/wp-includes

Files:

• admin-bar.php (modified) (2 diffs)
• link-template.php (modified) (3 diffs)
• post-functions.php (modified) (2 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -594 +594 @@
             && ( $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 ) )
         {
@@ -605 +605 @@
             && ( $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 ) )
         {

trunk/src/wp-includes/link-template.php

@@ -938 +938 @@
     }
 
-    $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 = '';
+    }
 
     /**
@@ -1255 +1259 @@
         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 = '';
     }
 
@@ -1275 +1275 @@
      *                        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 );
 }
 

trunk/src/wp-includes/post-functions.php

@@ -1013 +1013 @@
     $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(
@@ -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 );