Changes in branches/3.1/wp-includes/post.php [18023:18368]

File:

• branches/3.1/wp-includes/post.php (modified) (3 diffs)

branches/3.1/wp-includes/post.php

@@ -2411 +2411 @@
 
         $postarr = wp_parse_args($postarr, $defaults);
+
+        unset( $postarr[ 'filter' ] );
+
         $postarr = sanitize_post($postarr, 'db');
 
@@ -3422 +3425 @@
         $where_post_type = $wpdb->prepare( "post_type = '%s' AND post_status = '%s'", $post_type, $post_status );
 
+        $orderby_array = array();
+        $allowed_keys = array('author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'modified',
+                                                  'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent',
+                                                  'ID', 'rand', 'comment_count');
+        foreach ( explode( ',', $sort_column ) as $orderby ) {
+                $orderby = trim( $orderby );
+                if ( !in_array( $orderby, $allowed_keys ) )
+                        continue;
+
+                switch ( $orderby ) {
+                        case 'menu_order':
+                                break;
+                        case 'ID':
+                                $orderby = "$wpdb->posts.ID";
+                                break;
+                        case 'rand':
+                                $orderby = 'RAND()';
+                                break;
+                        case 'comment_count':
+                                $orderby = "$wpdb->posts.comment_count";
+                                break;
+                        default:
+                                if ( 0 === strpos( $orderby, 'post_' ) )
+                                        $orderby = "$wpdb->posts." . $orderby;
+                                else
+                                        $orderby = "$wpdb->posts.post_" . $orderby;
+                }
+
+                $orderby_array[] = $orderby;
+
+        }
+        $sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
+
+        $sort_order = strtoupper( $sort_order );
+        if ( '' !== $sort_order && !in_array( $sort_order, array( 'ASC', 'DESC' ) ) )
+                $sort_order = 'ASC';
+
         $query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
         $query .= $author_query;
@@ -3547 +3587 @@
         if ( !empty($parent) )
                 $object['post_parent'] = $parent;
+
+        unset( $object[ 'filter' ] );
 
         $object = sanitize_post($object, 'db');