Changeset 24182

Timestamp:

05/07/2013 11:46:35 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices in Media Library if an attachment parent does not exist. props trepmal, viniciusmassuchetto, alex-ye, adamsilverstein for initial patches. fixes #22312. fixes #23154.

Location:

trunk

Files:

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

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

@@ -303 +303 @@
 
     case 'parent':
-        if ( $post->post_parent > 0 ) {
-            if ( get_post( $post->post_parent ) ) {
-                $title =_draft_or_post_title( $post->post_parent );
-            }
+        if ( $post->post_parent > 0 && get_post( $post->post_parent ) ) {
+            $title = _draft_or_post_title( $post->post_parent );
 ?>
             <td <?php echo $attributes ?>><strong>
-                <?php if( current_user_can( 'edit_post', $post->post_parent ) ) { ?>
+                <?php if ( current_user_can( 'edit_post', $post->post_parent ) ) { ?>
                     <a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
                         <?php echo $title ?></a><?php
@@ -321 +319 @@
 ?>
             <td <?php echo $attributes ?>><?php _e( '(Unattached)' ); ?><br />
-            <?php if( $user_can_edit ) {?>
+            <?php if ( $user_can_edit ) { ?>
                 <a class="hide-if-no-js"
                     onclick="findPosts.open( 'media[]','<?php echo $post->ID ?>' ); return false;"

trunk/wp-includes/link-template.php

@@ -302 +302 @@
 
     $post = get_post( $post );
-
-    if ( $wp_rewrite->using_permalinks() && ( $post->post_parent > 0 ) && ( $post->post_parent != $post->ID ) ) {
-        $parent = get_post($post->post_parent);
+    $parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
+
+    if ( $wp_rewrite->using_permalinks() && $parent ) {
         if ( 'page' == $parent->post_type )
             $parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front