Changeset 35848 for trunk/src/wp-includes/query.php

Timestamp:

12/10/2015 03:05:34 AM (9 years ago)

Author:

johnbillion

Message:

Comments: The year is 2003. Permalinks are a new thing and everyone's using Blogger. It's a time when opening a modal window in JavaScript to view a section of a website is not a completely weird thing, although many users get annoyed by it. b2 has recently become WordPress, and with it comes a bunch of functionality that will become stale over the next decade, remnants of simpler times.

Twelve years later, after no fewer than three themes have intentionally implemented popup comments in their functionality, before being abandoned for at least the last six years, we've reached a time where we can put this era behind us. A time when we can remove comment popup functionality from WordPress.

If this breaks the internet, I'll eat my hat.

Fixes #28617

File:

• trunk/src/wp-includes/query.php (modified) (12 diffs)

trunk/src/wp-includes/query.php

@@ -295 +295 @@
 
     return $wp_query->is_tax( $taxonomy, $term );
-}
-
-/**
- * Whether the current URL is within the comments popup window.
- *
- * @since 1.5.0
- *
- * @global WP_Query $wp_query Global WP_Query instance.
- *
- * @return bool
- */
-function is_comments_popup() {
-    global $wp_query;
-
-    if ( ! isset( $wp_query ) ) {
-        _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
-        return false;
-    }
-
-    return $wp_query->is_comments_popup();
 }
 
@@ -863 +843 @@
  *
  * @since 1.5.0
+ * @since 4.5.0 Removed the `$comments_popup` property.
  */
 class WP_Query {
@@ -1229 +1210 @@
      */
     public $is_embed = false;
-
-    /**
-     * Set if query is within comments popup window.
-     *
-     * @since 1.5.0
-     * @access public
-     * @var bool
-     */
-    public $is_comments_popup = false;
 
     /**
@@ -1390 +1362 @@
         $this->is_home = false;
         $this->is_404 = false;
-        $this->is_comments_popup = false;
         $this->is_paged = false;
         $this->is_admin = false;
@@ -1442 +1413 @@
      *
      * @since 2.1.0
+     * @since 4.4.0 Removed the `comments_popup` public query variable.
      * @access public
      *
@@ -1477 +1449 @@
             , 'tb'
             , 'paged'
-            , 'comments_popup'
             , 'meta_key'
             , 'meta_value'
@@ -1512 +1483 @@
      * @since 4.4.0 Introduced `$post_name__in` and `$title` parameters. `$s` was updated to support excluded
      *              search terms, by prepending a hyphen.
+     * @since 4.5.0 Removed the `$comments_popup` parameter.
      * @access public
      *
@@ -1530 +1502 @@
      *     @type int          $comments_per_page       The number of comments to return per page.
      *                                                 Default 'comments_per_page' option.
-     *     @type int|string   $comments_popup          Whether the query is within the comments popup. Default empty.
      *     @type array        $date_query              An associative array of WP_Date_Query arguments.
      *                                                 {@see WP_Date_Query::__construct()}
@@ -1792 +1763 @@
             $this->is_paged = true;
 
-        if ( '' != $qv['comments_popup'] )
-            $this->is_comments_popup = true;
-
         // if we're previewing inside the write screen
         if ( '' != $qv['preview'] )
@@ -1812 +1780 @@
             $this->is_comment_feed = true;
 
-        if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $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 || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
             $this->is_home = true;
 
@@ -2772 +2740 @@
         }
 
-        if ( intval($q['comments_popup']) )
-            $q['p'] = absint($q['comments_popup']);
-
         // If an attachment is requested by number, let it supersede any post number.
         if ( $q['attachment_id'] )
@@ -4385 +4350 @@
      *
      * @since 3.1.0
+     * @deprecated 4.5.0
      *
      * @return bool
      */
     public function is_comments_popup() {
-        return (bool) $this->is_comments_popup;
+        _deprecated_function( __FUNCTION__, '4.5' );
+
+        return false;
     }