Ticket #15773: 15773.diff

wp-includes/query.php

@@ -1063 +1063 @@
         var $is_attachment = false;
 
         /**
-         * Set if is single, is a page, or is an attachment.
-         *
-         * @since 2.1.0
-         * @access public
-         * @var bool
-         */
-        var $is_singular = false;
-
-        /**
          * Set if query is for robots.
          *
          * @since 2.1.0
@@ -1101 +1092 @@
         var $is_post_type_archive = false;
 
         /**
+         * Used by comments_template()
+         *
+         * @since 3.2.0
+         * @access public
+         * @var bool
+         */
+        var $comments_by_type;
+
+        /**
+         * Overloading, to access deprecated query flags
+         *
+         * The query flags are what page info WordPress was able to figure out.
+         *
+         * @since 3.2.0
+         * @access public
+         */
+        function __get( $key ) {
+                if ( 'is_singular' == $key ) {
+                        _deprecated_argument( __CLASS__, '3.2', 'Use the is_singular() method instead.' );
+                        return $this->is_singular();
+                }
+        }
+
+        /**
          * Resets query flags to false.
          *
          * The query flags are what page info WordPress was able to figure out.
@@ -1132 +1147 @@
                 $this->is_paged = false;
                 $this->is_admin = false;
                 $this->is_attachment = false;
-                $this->is_singular = false;
                 $this->is_robots = false;
                 $this->is_posts_page = false;
                 $this->is_post_type_archive = false;
@@ -1402 +1416 @@
                         $qv['withcomments'] = 1;
                 }
 
-                $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
-
-                if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+                if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular() ) ) )
                         $this->is_comment_feed = true;
 
-                if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) )
+                if ( !( $this->is_singular() || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) )
                         $this->is_home = true;
 
                 // Correct is_* for page_on_front and page_for_posts
@@ -1460 +1472 @@
                 if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
                         $this->is_comment_feed = false;
 
-                $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
                 // Done correcting is_* for page_on_front and page_for_posts
 
                 if ( '404' == $qv['error'] )
@@ -1523 +1534 @@
                 }
 
                 // Category stuff
-                if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular ) {
+                if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular() ) {
                         $q['cat'] = ''.urldecode($q['cat']).'';
                         $q['cat'] = addslashes_gpc($q['cat']);
                         $cat_array = preg_split('/[,\s]+/', $q['cat']);
@@ -2187 +2198 @@
                         }
                         foreach ( $statuswheres as $statuswhere )
                                 $where .= " AND $statuswhere";
-                } elseif ( !$this->is_singular ) {
+                } elseif ( !$this->is_singular() ) {
                         $where .= " AND ($wpdb->posts.post_status = 'publish'";
 
                         // Add public states.
@@ -2229 +2240 @@
                 }
 
                 // Paging
-                if ( empty($q['nopaging']) && !$this->is_singular ) {
+                if ( empty($q['nopaging']) && !$this->is_singular() ) {
                         $page = absint($q['paged']);
                         if ( empty($page) )
                                 $page = 1;
@@ -2246 +2257 @@
                 }
 
                 // Comments feeds
-                if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
+                if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular() ) ) {
                         if ( $this->is_archive || $this->is_search ) {
                                 $cjoin = "JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join ";
                                 $cwhere = "WHERE comment_approved = '1' $where";
@@ -2358 +2369 @@
                 if ( !$q['suppress_filters'] )
                         $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
 
-                if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
+                if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular() ) {
                         $cjoin = apply_filters_ref_array('comment_feed_join', array( '', &$this ) );
                         $cwhere = apply_filters_ref_array('comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
                         $cgroupby = apply_filters_ref_array('comment_feed_groupby', array( '', &$this ) );
@@ -2674 +2685 @@
                         $page_for_posts = get_option('page_for_posts');
                         $this->queried_object = & get_page( $page_for_posts );
                         $this->queried_object_id = (int) $this->queried_object->ID;
-                } elseif ( $this->is_singular && !is_null($this->post) ) {
+                } elseif ( $this->is_singular() && !is_null($this->post) ) {
                         $this->queried_object = $this->post;
                         $this->queried_object_id = (int) $this->post->ID;
                 } elseif ( $this->is_author ) {
@@ -3147 +3158 @@
          * @return bool
          */
         function is_singular( $post_types = '' ) {
-                if ( empty( $post_types ) || !$this->is_singular )
-                        return (bool) $this->is_singular;
+                $is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
+                if ( empty( $post_types ) || !$is_singular )
+                        return $is_singular;
+
                 $post_obj = $this->get_queried_object();
 
                 return in_array( $post_obj->post_type, (array) $post_types );