Ticket #25495: 25495-patch.2.diff

wp-includes/class-wp.php

@@ -120 +120 @@
         function parse_request($extra_query_vars = '') {
                 global $wp_rewrite;
 
+                /**
+                 * Filter to test if parse_request() should be run or not.
+                 *
+                 * Hook here and return false to stop parse_request() from proceeding.
+                 *
+                 * @since 3.5.0
+                 *
+                 * @param bool true Wether or not to run parse_request.
+                 * @param WP $this The WordPress environment instance.
+                 * @param array|string $extra_query_vars The extra query variables passed.
+                 */
                 if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
                         return;
 
@@ -236 +247 @@
                         }
                 }
 
-                $this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
+                $this->public_query_vars;
+                /**
+                 * Filter the query variables whitelist before processing.
+                 *
+                 * Allows (publicly allowed) query vars to be added, removed, or changed changed prior
+                 * to executing the query. Needed to allow custom rewrite rules using your own arguments
+                 * to work, or any other custom query variables you want usable on the public side.
+                 *
+                 * @since 1.5.2
+                 *
+                 * @param array $public_query_vars The array of whitelisted query variables.
+                 */
+                $this->public_query_vars = apply_filters( 'query_vars', $public_query_vars );
 
                 foreach ( get_post_types( array(), 'objects' ) as $post_type => $t )
                         if ( $t->query_var )
@@ -294 +317 @@
                 if ( isset($error) )
                         $this->query_vars['error'] = $error;
 
-                $this->query_vars = apply_filters('request', $this->query_vars);
+                $query_vars = $this->query_vars;
+                /**
+                 * Filter the query variables array before parsing.
+                 *
+                 * @since 2.1.0
+                 *
+                 * @param array $query_vars The array of requested query variables.
+                 */
+                $this->query_vars = apply_filters( 'request', $query_vars );
 
-                do_action_ref_array('parse_request', array(&$this));
+                /**
+                 * Fires actions to be run after parse_request is complete.
+                 *
+                 * @since 2.1.0
+                 *
+                 * @param WP &$this The WordPress environment instance (passed by reference).
+                 */
+                do_action_ref_array( 'parse_request', array( &$this ) );
         }
 
         /**
@@ -366 +404 @@
                         }
                 }
 
-                $headers = apply_filters('wp_headers', $headers, $this);
+                /**
+                 * Filter the HTTP headers before they're sent to the browser.
+                 *
+                 * @since 2.8.0
+                 *
+                 * @param array $headers The list of headers to be sent.
+                 * @param WP $this The WordPress environment instance.
+                 */
+                $headers = apply_filters( 'wp_headers', $headers, $this );
 
                 if ( ! empty( $status ) )
                         status_header( $status );
@@ -396 +442 @@
                 if ( $exit_required )
                         exit();
 
-                do_action_ref_array('send_headers', array(&$this));
+                /**
+                 * Fires actions to be run after send_headers() is complete.
+                 *
+                 * @since 2.1.0
+                 *
+                 * @param WP &$this The WordPress environment instance (passed by reference).
+                 */
+                do_action_ref_array( 'send_headers', array( &$this ) );
         }
 
         /**
@@ -420 +473 @@
 
                 // query_string filter deprecated. Use request filter instead.
                 if ( has_filter('query_string') ) {  // Don't bother filtering and parsing if no plugins are hooked in.
-                        $this->query_string = apply_filters('query_string', $this->query_string);
+                        /**
+                         * Filter the query string before parsing.
+                         *
+                         * @deprecated Use 'query_vars' or 'request' instead.
+                         *
+                         * @since 1.5.2
+                         *
+                         * @param string $query_string The query string to modify.
+                         */
+                        $this->query_string = apply_filters( 'query_string', $this->query_string );
                         parse_str($this->query_string, $this->query_vars);
                 }
         }
@@ -549 +611 @@
                 $this->query_posts();
                 $this->handle_404();
                 $this->register_globals();
-                do_action_ref_array('wp', array(&$this));
+                
+                /**
+                 * Fires actions to be run at the end of WP environment setup.
+                 *
+                 * @since 2.1.0
+                 *
+                 * @param WP &$this The WordPress environment instance (passed by reference).
+                 */
+                do_action_ref_array( 'wp', array( &$this ) );
         }
 
 }