WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / class-wp.php

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 3685305a2658e07f5fb72c38124fdaca550082d6..1217f1c370d499fc1d4ca1ac59faf3cebda4ca3c 100644 (file)
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -15,7 +15,7 @@ class WP {
         * @access public
         * @var array
         */
         * @access public
         * @var array
         */

-       public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
+       public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );

 
        /**
         * Private query variables.
 
        /**
         * Private query variables.


@@ -23,6 +23,7 @@ class WP {
         * Long list of private query variables.
         *
         * @since 2.0.0
         * Long list of private query variables.
         *
         * @since 2.0.0

+        * @access public

         * @var array
         */
        public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title' );
         * @var array
         */
        public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title' );


@@ -31,6 +32,7 @@ class WP {
         * Extra query variables set by the user.
         *
         * @since 2.1.0
         * Extra query variables set by the user.
         *
         * @since 2.1.0

+        * @access public

         * @var array
         */
        public $extra_query_vars = array();
         * @var array
         */
        public $extra_query_vars = array();


@@ -39,6 +41,7 @@ class WP {
         * Query variables for setting up the WordPress Query Loop.
         *
         * @since 2.0.0
         * Query variables for setting up the WordPress Query Loop.
         *
         * @since 2.0.0

+        * @access public

         * @var array
         */
        public $query_vars;
         * @var array
         */
        public $query_vars;


@@ -47,6 +50,7 @@ class WP {
         * String parsed to set the query variables.
         *
         * @since 2.0.0
         * String parsed to set the query variables.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $query_string;
         * @var string
         */
        public $query_string;


@@ -55,6 +59,7 @@ class WP {
         * Permalink or requested URI.
         *
         * @since 2.0.0
         * Permalink or requested URI.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $request;
         * @var string
         */
        public $request;


@@ -63,6 +68,7 @@ class WP {
         * Rewrite rule the request matched.
         *
         * @since 2.0.0
         * Rewrite rule the request matched.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $matched_rule;
         * @var string
         */
        public $matched_rule;


@@ -71,6 +77,7 @@ class WP {
         * Rewrite query the request matched.
         *
         * @since 2.0.0
         * Rewrite query the request matched.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $matched_query;
         * @var string
         */
        public $matched_query;


@@ -79,6 +86,7 @@ class WP {
         * Whether already did the permalink.
         *
         * @since 2.0.0
         * Whether already did the permalink.
         *
         * @since 2.0.0

+        * @access public

         * @var bool
         */
        public $did_permalink = false;
         * @var bool
         */
        public $did_permalink = false;


@@ -87,6 +95,7 @@ class WP {
         * Add name to list of public query variables.
         *
         * @since 2.1.0
         * Add name to list of public query variables.
         *
         * @since 2.1.0

+        * @access public

         *
         * @param string $qv Query variable name.
         */
         *
         * @param string $qv Query variable name.
         */


@@ -95,10 +104,23 @@ class WP {
                        $this->public_query_vars[] = $qv;
        }
 
                        $this->public_query_vars[] = $qv;
        }
 

+       /**
+        * Removes a query variable from a list of public query variables.
+        *
+        * @since 4.5.0
+        * @access public
+        *
+        * @param string $name Query variable name.
+        */
+       public function remove_query_var( $name ) {
+               $this->public_query_vars = array_diff( $this->public_query_vars, array( $name ) );
+       }
+

        /**
         * Set the value of a query variable.
         *
         * @since 2.3.0
        /**
         * Set the value of a query variable.
         *
         * @since 2.3.0

+        * @access public

         *
         * @param string $key Query variable name.
         * @param mixed $value Query variable value.
         *
         * @param string $key Query variable name.
         * @param mixed $value Query variable value.


@@ -114,6 +136,7 @@ class WP {
         * filters and actions that can be used to further manipulate the result.
         *
         * @since 2.0.0
         * filters and actions that can be used to further manipulate the result.
         *
         * @since 2.0.0

+        * @access public

         *
         * @global WP_Rewrite $wp_rewrite
         *
         *
         * @global WP_Rewrite $wp_rewrite
         *


@@ -308,12 +331,12 @@ class WP {
                        if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
                                $this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
 
                        if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
                                $this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
 

-               // Don't allow non-public taxonomies to be queried from the front-end.
+               // Don't allow non-publicly queryable taxonomies to be queried from the front end.

                if ( ! is_admin() ) {
                if ( ! is_admin() ) {

-                       foreach ( get_taxonomies( array( 'public' => false ), 'objects' ) as $taxonomy => $t ) {
+                       foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {

                                /*
                                 * Disallow when set to the 'taxonomy' query var.
                                /*
                                 * Disallow when set to the 'taxonomy' query var.

-                                * Non-public taxonomies cannot register custom query vars. See register_taxonomy().
+                                * Non-publicly queryable taxonomies cannot register custom query vars. See register_taxonomy().

                                 */
                                if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
                                        unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
                                 */
                                if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
                                        unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );


@@ -370,6 +393,7 @@ class WP {
         *
         * @since 2.0.0
         * @since 4.4.0 `X-Pingback` header is added conditionally after posts have been queried in handle_404().
         *
         * @since 2.0.0
         * @since 4.4.0 `X-Pingback` header is added conditionally after posts have been queried in handle_404().

+        * @access public

         */
        public function send_headers() {
                $headers = array();
         */
        public function send_headers() {
                $headers = array();


@@ -492,6 +516,7 @@ class WP {
         * use the 'request' filter instead.
         *
         * @since 2.0.0
         * use the 'request' filter instead.
         *
         * @since 2.0.0

+        * @access public

         */
        public function build_query_string() {
                $this->query_string = '';
         */
        public function build_query_string() {
                $this->query_string = '';


@@ -525,6 +550,9 @@ class WP {
         * be taken when naming global variables that might interfere with the
         * WordPress environment.
         *
         * be taken when naming global variables that might interfere with the
         * WordPress environment.
         *

+        * @since 2.0.0
+        * @access public
+        *

         * @global WP_Query     $wp_query
         * @global string       $query_string Query string for the loop.
         * @global array        $posts The found posts.
         * @global WP_Query     $wp_query
         * @global string       $query_string Query string for the loop.
         * @global array        $posts The found posts.


@@ -533,8 +561,6 @@ class WP {
         * @global int          $more Only set, if single page or post.
         * @global int          $single If single page or post. Only set, if single page or post.
         * @global WP_User      $authordata Only set, if author archive.
         * @global int          $more Only set, if single page or post.
         * @global int          $single If single page or post. Only set, if single page or post.
         * @global WP_User      $authordata Only set, if author archive.

-        *
-        * @since 2.0.0

         */
        public function register_globals() {
                global $wp_query;
         */
        public function register_globals() {
                global $wp_query;


@@ -562,6 +588,7 @@ class WP {
         * Set up the current user.
         *
         * @since 2.0.0
         * Set up the current user.
         *
         * @since 2.0.0

+        * @access public

         */
        public function init() {
                wp_get_current_user();
         */
        public function init() {
                wp_get_current_user();


@@ -571,6 +598,7 @@ class WP {
         * Set up the Loop based on the query variables.
         *
         * @since 2.0.0
         * Set up the Loop based on the query variables.
         *
         * @since 2.0.0

+        * @access public

         *
         * @global WP_Query $wp_the_query
         */
         *
         * @global WP_Query $wp_the_query
         */


@@ -594,12 +622,28 @@ class WP {
         * a 404 so that canonical redirection logic can kick in.
         *
         * @since 2.0.0
         * a 404 so that canonical redirection logic can kick in.
         *
         * @since 2.0.0

+     * @access public

         *
         * @global WP_Query $wp_query
         */
        public function handle_404() {
                global $wp_query;
 
         *
         * @global WP_Query $wp_query
         */
        public function handle_404() {
                global $wp_query;
 

+               /**
+                * Filter whether to short-circuit default header status handling.
+                *
+                * Returning a non-false value from the filter will short-circuit the handling
+                * and return early.
+                *
+                * @since 4.5.0
+                *
+                * @param bool     $preempt  Whether to short-circuit default header status handling. Default false.
+                * @param WP_Query $wp_query WordPress Query object.
+                */
+               if ( false !== apply_filters( 'pre_handle_404', false, $wp_query ) ) {
+                       return;
+               }
+

                // If we've already issued a 404, bail.
                if ( is_404() )
                        return;
                // If we've already issued a 404, bail.
                if ( is_404() )
                        return;


@@ -671,6 +715,7 @@ class WP {
         * object.
         *
         * @since 2.0.0
         * object.
         *
         * @since 2.0.0

+        * @access public

         *
         * @param string|array $query_args Passed to {@link parse_request()}
         */
         *
         * @param string|array $query_args Passed to {@link parse_request()}
         */