Ticket #5358: 5358.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
+ */
+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()
@@ -887 +917 @@
         var $queried_object_id;
 
         /**
+         * Holds the data for the objects that are queried.
+         *
+         * @since 3.7.0
+         * @access public
+         * @var object|array
+         */
+        var $queried_objects;
+
+        /**
+         * The IDs of the queried objects.
+         *
+         * @since 3.7.0
+         * @access public
+         * @var int
+         */
+        var $queried_object_ids;
+
+        /**
          * Get post database query.
          *
          * @since 2.0.1
@@ -2990 +3038 @@
         }
 
         /**
+         * 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
+         */
+        function get_queried_objects() {
+                if ( isset( $this->queried_objects ) )
+                        return $this->queried_objects;
+
+                $terms = array();
+                $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' );
+
+                        foreach ( $tax_query_in_and as $query ) {
+                                if ( 'term_id' == $query['field'] ) {
+                                        foreach ( $query['terms'] as $term ) {
+                                                if ( ! empty( $term ) && ! is_wp_error( $term ) )
+                                                        $terms[] = get_term( $term, $query['taxonomy'] );
+                                        }
+                                } elseif ( $query['terms'] ) {
+                                        foreach ( $query['terms'] as $term ) {
+                                                if ( ! empty( $term ) && ! is_wp_error( $term ) )
+                                                        $terms[] = get_term_by( $query['field'], $term, $query['taxonomy'] );
+                                        }
+                                }
+                        }
+
+                        if ( ! empty( $terms ) ) {
+                                foreach ( $terms as $term ) {
+                                        if ( 'category' === $term->taxonomy )
+                                                _make_cat_compat( $term );
+
+                                        $this->queried_objects[] = $term;
+                                        $this->queried_object_ids[] = (int) $term->term_id;
+                                }
+                        }
+
+                } else {
+                        $this->queried_objects = array( $this->get_queried_object() );
+                        $this->queried_object_ids = array( $this->get_queried_object_id() );
+                }
+
+                return $this->queried_objects;
+        }
+
+        /**
          * Retrieve queried object.
          *
          * If queried object is not set, then the queried object will be set from
@@ -3053 +3156 @@
         function get_queried_object_id() {
                 $this->get_queried_object();
 
-                if ( isset($this->queried_object_id) ) {
+                if ( isset( $this->queried_object_id ) )
                         return $this->queried_object_id;
-                }
+
+                return 0;
+        }
+
+        /**
+         * Retrieve IDs of the current queried objects.
+         *
+         * @since 3.7.0
+         * @access public
+         *
+         * @return array
+         */
+        function get_queried_object_ids() {
+                $this->get_queried_objects();
+
+                if ( isset( $this->queried_object_ids ) )
+                        return $this->queried_object_ids;
 
                 return 0;
         }