Ticket #5358: 5358.2.diff

wp-includes/query.php

@@ -58 +58 @@
 }
 
 /**
+ * Retrieve the currently-queried objects. Wrapper for $wp_query->get_queried_objects()
+ *
+ * @uses WP_Query::get_queried_objects
+ *
+ * @since 3.7.0
+ * @access public
+ *
+ * @return object|null
+ */
+function get_queried_objects() {
+        global $wp_query;
+        return $wp_query->get_queried_objects();
+}
+
+/**
+ * Retrieve IDs of the current queried objects. Wrapper for $wp_query->get_queried_object_ids()
+ *
+ * @uses WP_Query::get_queried_object_ids()
+ *
+ * @since 3.7.0
+ * @access public
+ *
+ * @return int
+ */
+function get_queried_object_ids() {
+        global $wp_query;
+        return $wp_query->get_queried_object_ids();
+}
+
+/**
  * Set query variable.
  *
  * @see WP_Query::set()
@@ -896 +926 @@
         var $queried_object_id;
 
         /**
+         * Holds the data for the objects that are queried.
+         *
+         * @since 3.7.0
+         * @access public
+         * @var array
+         */
+        var $queried_objects;
+
+        /**
+         * The IDs of the queried objects.
+         *
+         * @since 3.7.0
+         * @access public
+         * @var array
+         */
+        var $queried_object_ids;
+
+        /**
          * Get post database query.
          *
          * @since 2.0.1
@@ -3027 +3075 @@
          * @return object
          */
         function get_queried_object() {
-                if ( isset($this->queried_object) )
-                        return $this->queried_object;
+                $this->get_queried_objects();
+                return $this->queried_object;
+        }
 
-                $this->queried_object = null;
-                $this->queried_object_id = 0;
+        /**
+         * Retrieve ID of the current queried object.
+         *
+         * @since 1.5.0
+         * @access public
+         *
+         * @return int
+         */
+        function get_queried_object_id() {
+                $this->get_queried_objects();
+                return $this->queried_object_id;
+        }
 
+        /**
+         * Retrieve queried objects.
+         *
+         * If queried objects is not set, then the queried object will be set from
+         * the categories, tags, taxonomies, posts page, single post, page, or author
+         * query variable. After it is set up, it will be returned.
+         *
+         * @since 3.7.0
+         * @access public
+         *
+         * @return array
+         */
+        public function get_queried_objects() {
+                if ( isset( $this->queried_objects ) )
+                        return $this->queried_objects;
+
+                $this->queried_objects = array();
+                $this->queried_object_ids = array();
+
                 if ( $this->is_category || $this->is_tag || $this->is_tax ) {
                         $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
 
+                        $terms = array();
                         $query = reset( $tax_query_in_and );
 
-                        if ( 'term_id' == $query['field'] )
-                                $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-                        elseif ( $query['terms'] )
-                                $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
+                        if ( $query['terms'] ) {
+                                foreach ( $query['terms'] as $term ) {
+                                        $term = get_term_by( $query['field'], $term, $query['taxonomy'] );
+                                        if ( $term && ! is_wp_error( $term ) ) {
+                                                $terms[] = $term;
+                                        }
+                                }
+                        }
 
-                        if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
-                                $this->queried_object = $term;
-                                $this->queried_object_id = (int) $term->term_id;
+                        if ( ! empty( $terms ) )  {
+                                if ( $this->is_category ) {
+                                        foreach ( $terms as &$category ) {
+                                                _make_cat_compat( $category );
+                                        }
+                                        unset( $category );
+                                }
 
-                                if ( $this->is_category )
-                                        _make_cat_compat( $this->queried_object );
+                                $this->queried_objects = $terms;
+                                $this->queried_object_ids = wp_list_pluck( $this->queried_objects, 'term_id' );
                         }
                 } elseif ( $this->is_post_type_archive ) {
-                        $this->queried_object = get_post_type_object( $this->get('post_type') );
+                        $post_types = (array) $this->get( 'post_type' );
+                        foreach ( $post_types as $post_type ) {
+                                $this->queried_objects[] = get_post_type_object( $post_type );
+                        }
                 } elseif ( $this->is_posts_page ) {
-                        $page_for_posts = get_option('page_for_posts');
-                        $this->queried_object = get_post( $page_for_posts );
-                        $this->queried_object_id = (int) $this->queried_object->ID;
-                } elseif ( $this->is_singular && !is_null($this->post) ) {
-                        $this->queried_object = $this->post;
-                        $this->queried_object_id = (int) $this->post->ID;
+                        $page_for_posts = get_option( 'page_for_posts' );
+                        $this->queried_objects[] = get_post( $page_for_posts );
+                        $this->queried_object_ids = wp_list_pluck( $this->queried_objects, 'ID' );
+                } elseif ( $this->is_singular && ! is_null( $this->post ) ) {
+                        $this->queried_objects[] = $this->post;
+                        $this->queried_object_ids = wp_list_pluck( $this->queried_objects, 'ID' );
                 } elseif ( $this->is_author ) {
-                        $this->queried_object_id = (int) $this->get('author');
-                        $this->queried_object = get_userdata( $this->queried_object_id );
+                        $this->queried_object_ids = array_map( 'absint', (array) $this->get( 'author' ) );
+                        foreach ( $this->queried_object_ids as $user_id ) {
+                                $this->queried_objects[] = get_userdata( $user_id );
+                        }
                 }
 
-                return $this->queried_object;
+                // back-compat for get_queried_object and get_queried_object_id
+                $this->queried_object = ( ! empty( $this->queried_objects ) ) ? reset( $this->queried_objects ) : null;
+                $this->queried_object_id = ( ! empty( $this->queried_object_ids ) ) ? reset( $this->queried_object_ids ) : 0;
+
+                return $this->queried_objects;
         }
 
         /**
-         * Retrieve ID of the current queried object.
+         * Retrieve IDs of the current queried objects.
          *
-         * @since 1.5.0
+         * @since 3.7.0
          * @access public
          *
-         * @return int
+         * @return array
          */
-        function get_queried_object_id() {
-                $this->get_queried_object();
-
-                if ( isset($this->queried_object_id) ) {
-                        return $this->queried_object_id;
-                }
-
-                return 0;
+        public function get_queried_object_ids() {
+                $this->get_queried_objects();
+                return $this->queried_object_ids;
         }
 
         /**