Ticket #21816: 21816.patch

wp-includes/media.php

@@ -801 +801 @@
                 'captiontag' => 'dd',
                 'columns'    => 3,
                 'size'       => 'thumbnail',
+                'ids'        => '',
                 'include'    => '',
                 'exclude'    => ''
         ), $attr));
@@ -809 +810 @@
         if ( 'RAND' == $order )
                 $orderby = 'none';
 
-        if ( !empty($include) ) {
-                $include = preg_replace( '/[^0-9,]+/', '', $include );
+        if ( !empty( $ids ) ) {
+                // 'ids' is explicitly ordered 
+                $orderby = 'none';
+                $include = $ids;
+        }
+
+        if ( !empty( $include ) ) {
+                $include = wp_parse_id_list( $include );
                 $_attachments = get_posts( array('include' => $include, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
 
                 $attachments = array();
                 foreach ( $_attachments as $key => $val ) {
-                        $attachments[$val->ID] = $_attachments[$key];
+                        $attachments[ $val->ID ] = $_attachments[ $key ];
                 }
-        } elseif ( !empty($exclude) ) {
-                $exclude = preg_replace( '/[^0-9,]+/', '', $exclude );
+
+                if ( !empty( $ids ) ) {
+                        $attachments_sorted = array();
+                        foreach ( $include as $id ) {
+                                if ( array_key_exists( $id, $attachments ) )
+                                        $attachments_sorted[ $id ] = $attachments[ $id ];
+                        }
+                        $attachments = $attachments_sorted;
+                }
+        } elseif ( !empty( $exclude ) ) {
+                $exclude = wp_parse_id_list( $exclude );
                 $attachments = get_children( array('post_parent' => $id, 'exclude' => $exclude, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
         } else {
                 $attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );