Changeset 29320

Timestamp:

07/29/2014 01:40:24 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices in Media Library if an attachment parent post type no longer exists.

Synchronize the 'edit_post' capability check between the list table and the media grid.

fixes #27446.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-includes/media-template.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -371 +371 @@
 ?>
             <td <?php echo $attributes ?>><strong>
-                <?php if ( current_user_can( 'edit_post', $post->post_parent ) && $parent_type && $parent_type->show_ui ) { ?>
+                <?php if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?>
                     <a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
                         <?php echo $title ?></a><?php

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

@@ -396 +396 @@
                         <label class="setting">
                             <span class="name"><?php _e( 'Uploaded To' ); ?></span>
-                            <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
+                            <# if ( data.uploadedToLink ) { #>
+                                <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
+                            <# } else { #>
+                                <span class="value">{{ data.uploadedToTitle }}</span>
+                            <# } #>
                         </label>
                     <# } #>

trunk/src/wp-includes/media.php

@@ -2637 +2637 @@
     if ( $attachment->post_parent ) {
         $post_parent = get_post( $attachment->post_parent );
-        $response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
+        $parent_type = get_post_type_object( $post_parent->post_type );
+        if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) {
+            $response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
+        }
         $response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(No title)' );
     }