Changeset 30068

Timestamp:

10/28/2014 08:42:20 PM (10 years ago)

Author:

wonderboymusic

Message:

The gallery shortcode used to accept a SQL chunk for the value of the orderby attribute. The reason? get_posts() used to be called in the shortcode handler with a query-string blob of arguments passed to it. To mitigate breakage, sanitize_sql_orderby() was created in [7592].

sanitize_sql_orderby() expects a comma to be present when multiple orderby values were passed. The correct syntax for multiple fields is space-delimited. Since [29027], comma-separated values would never be parsed correctly when passed to WP_Query->parse_orderby().

sanitize_sql_orderby() is used nowhere else in core, save for the playlist shortcode - I only added it there because I was mimic'ing the gallery logic. The function call can be removed from both shortcode handlers.

See #6476.
Fixes #23873.

File:

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

trunk/src/wp-includes/media.php

@@ -937 +937 @@
     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'] );
-        }
     }
 
@@ -1057 +1049 @@
     $i = 0;
     foreach ( $attachments as $id => $attachment ) {
-        
+
         $attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : '';
         if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) {
@@ -1221 +1213 @@
     }
 
-    /*
-     * 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'] );
-    }
-
     $atts = shortcode_atts( array(
         'type'      => 'audio',