Changeset 28584 for trunk/src/wp-includes/media.php

Timestamp:

05/27/2014 10:54:45 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Avoid a PHP notice in adjacent_image_link() if no images were found.

props nabil_kadimi.
see #28361.

File:

• trunk/src/wp-includes/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -1903 +1903 @@
     $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
 
-    foreach ( $attachments as $k => $attachment )
-        if ( $attachment->ID == $post->ID )
+    foreach ( $attachments as $k => $attachment ) {
+        if ( $attachment->ID == $post->ID ) {
             break;
-
-    $k = $prev ? $k - 1 : $k + 1;
-
-    $output = $attachment_id = null;
-    if ( isset( $attachments[ $k ] ) ) {
-        $attachment_id = $attachments[ $k ]->ID;
-        $output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+        }
+    }
+
+    $output = '';
+    $attachment_id = 0;
+
+    if ( $attachments ) {
+        $k = $prev ? $k - 1 : $k + 1;
+
+        if ( isset( $attachments[ $k ] ) ) {
+            $attachment_id = $attachments[ $k ]->ID;
+            $output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+        }
     }