Changeset 7592 for trunk/wp-includes/media.php

Timestamp:

04/03/2008 03:05:49 AM (18 years ago)

Author:

markjaquith

Message:

Fix gallery shortcode orderby param for all SQL setups. Sanitize orderby. fixes #6476 for trunk

File:

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

trunk/wp-includes/media.php

@@ -340 +340 @@
     if ( $output != '' )
         return $output;
-        
+
+    // We're trusting author input, so let's at least make sure it looks like a valid orderby statement
+    if ( isset( $attr['orderby'] ) ) {
+        $attr['orderby'] = sanitize_sql_orderby( $attr['orderby'] );
+        if ( !$attr['orderby'] )
+            unset( $attr['orderby'] );
+    }
+
     extract(shortcode_atts(array(
         'orderby'    => 'menu_order ASC, ID ASC',
@@ -352 +359 @@
 
     $id = intval($id);
-    $orderby = addslashes($orderby);
-    $attachments = get_children("post_parent=$id&post_type=attachment&post_mime_type=image&orderby=\"{$orderby}\"");
+    $attachments = get_children("post_parent=$id&post_type=attachment&post_mime_type=image&orderby={$orderby}");
 
     if ( empty($attachments) )
@@ -427 +433 @@
     global $post;
     $post = get_post($post);
-    $attachments = array_values(get_children("post_parent=$post->post_parent&post_type=attachment&post_mime_type=image&orderby=\"menu_order ASC, ID ASC\""));
+    $attachments = array_values(get_children("post_parent=$post->post_parent&post_type=attachment&post_mime_type=image&orderby=menu_order ASC, ID ASC"));
 
     foreach ( $attachments as $k => $attachment )