Changeset 15501

Timestamp:

08/16/2010 01:36:21 AM (14 years ago)

Author:

scribu

Message:

Safer hierarchical display check. Fixes #14600; See #14579

Location:

trunk

Files:

• wp-admin/includes/default-list-tables.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)

trunk/wp-admin/includes/default-list-tables.php

@@ -63 +63 @@
         $avail_post_stati = wp_edit_posts_query();
 
-        $this->hierarchical_display = ( $post_type_object->hierarchical && 0 === strpos( get_query_var( 'orderby' ), 'menu_order' ) );
+        $this->hierarchical_display = ( $post_type_object->hierarchical && 'menu_order title' == $wp_query->query['orderby'] );
 
         $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;

trunk/wp-includes/query.php

@@ -1247 +1247 @@
         if ( !empty($query) || !isset($this->query) ) {
             $this->init();
-            if ( is_array($query) )
-                $this->query_vars = $query;
-            else
-                parse_str($query, $this->query_vars);
-            $this->query = $query;
+            $this->query = $this->query_vars = wp_parse_args($query);
         }