Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-01 21:21:24 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@22891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-11-28 03:51:27 +00:00
parent 2b4da9e635
commit 09d59a0255
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/media.php
View File

@ -669,6 +669,12 @@ function gallery_shortcode($attr) {
static $instance = 0;
$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);
if ( $output != '' )
@ -690,7 +696,6 @@ function gallery_shortcode($attr) {
'captiontag' => 'dd',
'columns' => 3,
'size' => 'thumbnail',
'ids' => '',
'include' => '',
'exclude' => ''
), $attr));
@ -699,12 +704,6 @@ function gallery_shortcode($attr) {
if ( 'RAND' == $order )
$orderby = 'none';
if ( !empty( $ids ) ) {
// 'ids' is explicitly ordered
$orderby = 'post__in';
$include = $ids;
}
if ( !empty($include) ) {
$_attachments = get_posts( array('include' => $include, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );