Changeset 22891

Timestamp:

11/28/2012 03:51:27 AM (12 years ago)

Author:

nacin

Message:

In the gallery shortcode, handle mapping of "ids" to include and orderby before the post_gallery filter. see #21816. fixes #22617.

File:

• trunk/wp-includes/media.php (modified) (3 diffs)

trunk/wp-includes/media.php

@@ -670 +670 @@
     $instance++;
 
+    if ( ! empty( $attr['ids'] ) ) {
+        // 'ids' is explicitly ordered
+        $attr['orderby'] = 'post__in';
+        $attr['include'] = $attr['ids'];
+    }
+
     // Allow plugins/themes to override the default gallery template.
     $output = apply_filters('post_gallery', '', $attr);
@@ -691 +697 @@
         'columns'    => 3,
         'size'       => 'thumbnail',
-        'ids'        => '',
         'include'    => '',
         'exclude'    => ''
@@ -699 +704 @@
     if ( 'RAND' == $order )
         $orderby = 'none';
-
-    if ( !empty( $ids ) ) {
-        // 'ids' is explicitly ordered
-        $orderby = 'post__in';
-        $include = $ids;
-    }
 
     if ( !empty($include) ) {