WordPress 4.0

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

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 7ca64697a5a4754b2dbfb093d6e042c8a02351a3..4edcaf7307c749603364ca4844a1bb9d5ccf200a 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
         */

-       var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'debug', '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');
+       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');

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


@@ -25,7 +25,7 @@ class WP {
         * @since 2.0.0
         * @var array
         */
         * @since 2.0.0
         * @var array
         */

-       var $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');
+       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' );

 
        /**
         * Extra query variables set by the user.
 
        /**
         * Extra query variables set by the user.


@@ -33,7 +33,7 @@ class WP {
         * @since 2.1.0
         * @var array
         */
         * @since 2.1.0
         * @var array
         */

-       var $extra_query_vars = array();
+       public $extra_query_vars = array();

 
        /**
         * Query variables for setting up the WordPress Query Loop.
 
        /**
         * Query variables for setting up the WordPress Query Loop.


@@ -41,7 +41,7 @@ class WP {
         * @since 2.0.0
         * @var array
         */
         * @since 2.0.0
         * @var array
         */

-       var $query_vars;
+       public $query_vars;

 
        /**
         * String parsed to set the query variables.
 
        /**
         * String parsed to set the query variables.


@@ -49,7 +49,7 @@ class WP {
         * @since 2.0.0
         * @var string
         */
         * @since 2.0.0
         * @var string
         */

-       var $query_string;
+       public $query_string;

 
        /**
         * Permalink or requested URI.
 
        /**
         * Permalink or requested URI.


@@ -57,7 +57,7 @@ class WP {
         * @since 2.0.0
         * @var string
         */
         * @since 2.0.0
         * @var string
         */

-       var $request;
+       public $request;

 
        /**
         * Rewrite rule the request matched.
 
        /**
         * Rewrite rule the request matched.


@@ -65,7 +65,7 @@ class WP {
         * @since 2.0.0
         * @var string
         */
         * @since 2.0.0
         * @var string
         */

-       var $matched_rule;
+       public $matched_rule;

 
        /**
         * Rewrite query the request matched.
 
        /**
         * Rewrite query the request matched.


@@ -73,7 +73,7 @@ class WP {
         * @since 2.0.0
         * @var string
         */
         * @since 2.0.0
         * @var string
         */

-       var $matched_query;
+       public $matched_query;

 
        /**
         * Whether already did the permalink.
 
        /**
         * Whether already did the permalink.


@@ -81,7 +81,7 @@ class WP {
         * @since 2.0.0
         * @var bool
         */
         * @since 2.0.0
         * @var bool
         */

-       var $did_permalink = false;
+       public $did_permalink = false;

 
        /**
         * Add name to list of public query variables.
 
        /**
         * Add name to list of public query variables.


@@ -90,7 +90,7 @@ class WP {
         *
         * @param string $qv Query variable name.
         */
         *
         * @param string $qv Query variable name.
         */

-       function add_query_var($qv) {
+       public function add_query_var($qv) {

                if ( !in_array($qv, $this->public_query_vars) )
                        $this->public_query_vars[] = $qv;
        }
                if ( !in_array($qv, $this->public_query_vars) )
                        $this->public_query_vars[] = $qv;
        }


@@ -103,7 +103,7 @@ class WP {
         * @param string $key Query variable name.
         * @param mixed $value Query variable value.
         */
         * @param string $key Query variable name.
         * @param mixed $value Query variable value.
         */

-       function set_query_var($key, $value) {
+       public function set_query_var($key, $value) {

                $this->query_vars[$key] = $value;
        }
 
                $this->query_vars[$key] = $value;
        }
 


@@ -117,9 +117,21 @@ class WP {
         *
         * @param array|string $extra_query_vars Set the extra query variables.
         */
         *
         * @param array|string $extra_query_vars Set the extra query variables.
         */

-       function parse_request($extra_query_vars = '') {
+       public function parse_request($extra_query_vars = '') {

                global $wp_rewrite;
 
                global $wp_rewrite;
 

+               /**
+                * Filter whether to parse the request.
+                *
+                * @since 3.5.0
+                *
+                * @param bool         $bool             Whether or not to parse the request. Default true.
+                * @param WP           $this             Current WordPress environment instance.
+                * @param array|string $extra_query_vars Extra passed query variables.
+                */
+               if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
+                       return;
+

                $this->query_vars = array();
                $post_type_query_vars = array();
 
                $this->query_vars = array();
                $post_type_query_vars = array();
 


@@ -138,36 +150,27 @@ class WP {
                        $error = '404';
                        $this->did_permalink = true;
 
                        $error = '404';
                        $this->did_permalink = true;
 

-                       if ( isset($_SERVER['PATH_INFO']) )
-                               $pathinfo = $_SERVER['PATH_INFO'];
-                       else
-                               $pathinfo = '';
-                       $pathinfo_array = explode('?', $pathinfo);
-                       $pathinfo = str_replace("%", "%25", $pathinfo_array[0]);
-                       $req_uri = $_SERVER['REQUEST_URI'];
-                       $req_uri_array = explode('?', $req_uri);
-                       $req_uri = $req_uri_array[0];
+                       $pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
+                       list( $pathinfo ) = explode( '?', $pathinfo );
+                       $pathinfo = str_replace( "%", "%25", $pathinfo );
+
+                       list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );

                        $self = $_SERVER['PHP_SELF'];
                        $self = $_SERVER['PHP_SELF'];

-                       $home_path = parse_url(home_url());
-                       if ( isset($home_path['path']) )
-                               $home_path = $home_path['path'];
-                       else
-                               $home_path = '';
-                       $home_path = trim($home_path, '/');
+                       $home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );

 
                        // Trim path info from the end and the leading home path from the
 
                        // Trim path info from the end and the leading home path from the

-                       // front.  For path info requests, this leaves us with the requesting
-                       // filename, if any.  For 404 requests, this leaves us with the
+                       // front. For path info requests, this leaves us with the requesting
+                       // filename, if any. For 404 requests, this leaves us with the

                        // requested permalink.
                        $req_uri = str_replace($pathinfo, '', $req_uri);
                        $req_uri = trim($req_uri, '/');
                        // requested permalink.
                        $req_uri = str_replace($pathinfo, '', $req_uri);
                        $req_uri = trim($req_uri, '/');

-                       $req_uri = preg_replace("|^$home_path|", '', $req_uri);
+                       $req_uri = preg_replace("|^$home_path|i", '', $req_uri);

                        $req_uri = trim($req_uri, '/');
                        $pathinfo = trim($pathinfo, '/');
                        $req_uri = trim($req_uri, '/');
                        $pathinfo = trim($pathinfo, '/');

-                       $pathinfo = preg_replace("|^$home_path|", '', $pathinfo);
+                       $pathinfo = preg_replace("|^$home_path|i", '', $pathinfo);

                        $pathinfo = trim($pathinfo, '/');
                        $self = trim($self, '/');
                        $pathinfo = trim($pathinfo, '/');
                        $self = trim($self, '/');

-                       $self = preg_replace("|^$home_path|", '', $self);
+                       $self = preg_replace("|^$home_path|i", '', $self);

                        $self = trim($self, '/');
 
                        // The requested permalink is in $pathinfo for path info requests and
                        $self = trim($self, '/');
 
                        // The requested permalink is in $pathinfo for path info requests and


@@ -185,62 +188,77 @@ class WP {
 
                        // Look for matches.
                        $request_match = $request;
 
                        // Look for matches.
                        $request_match = $request;

-                       foreach ( (array) $rewrite as $match => $query) {
-                               // Don't try to match against AtomPub calls
-                               if ( $req_uri == 'wp-app.php' )
-                                       break;
-
-                               // If the requesting file is the anchor of the match, prepend it
-                               // to the path info.
-                               if ( (! empty($req_uri)) && (strpos($match, $req_uri) === 0) && ($req_uri != $request) )
-                                       $request_match = $req_uri . '/' . $request;
-
-                               if ( preg_match("#^$match#", $request_match, $matches) ||
-                                       preg_match("#^$match#", urldecode($request_match), $matches) ) {
-                                       // Got a match.
-                                       $this->matched_rule = $match;
-
-                                       // Trim the query of everything up to the '?'.
-                                       $query = preg_replace("!^.+\?!", '', $query);
+                       if ( empty( $request_match ) ) {
+                               // An empty request could only match against ^$ regex
+                               if ( isset( $rewrite['$'] ) ) {
+                                       $this->matched_rule = '$';
+                                       $query = $rewrite['$'];
+                                       $matches = array('');
+                               }
+                       } else {
+                               foreach ( (array) $rewrite as $match => $query ) {
+                                       // If the requesting file is the anchor of the match, prepend it to the path info.
+                                       if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
+                                               $request_match = $req_uri . '/' . $request;
+
+                                       if ( preg_match("#^$match#", $request_match, $matches) ||
+                                               preg_match("#^$match#", urldecode($request_match), $matches) ) {
+
+                                               if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+                                                       // this is a verbose page match, lets check to be sure about it
+                                                       if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
+                                                               continue;
+                                               }

 
 

-                                       // Substitute the substring matches into the query.
-                                       $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
+                                               // Got a match.
+                                               $this->matched_rule = $match;
+                                               break;
+                                       }
+                               }
+                       }

 
 

-                                       $this->matched_query = $query;
+                       if ( isset( $this->matched_rule ) ) {
+                               // Trim the query of everything up to the '?'.
+                               $query = preg_replace("!^.+\?!", '', $query);

 
 

-                                       // Parse the query.
-                                       parse_str($query, $perma_query_vars);
+                               // Substitute the substring matches into the query.
+                               $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));

 
 

-                                       // If we're processing a 404 request, clear the error var
-                                       // since we found something.
-                                       if ( isset($_GET['error']) )
-                                               unset($_GET['error']);
+                               $this->matched_query = $query;

 
 

-                                       if ( isset($error) )
-                                               unset($error);
+                               // Parse the query.
+                               parse_str($query, $perma_query_vars);

 
 

-                                       break;
-                               }
+                               // If we're processing a 404 request, clear the error var since we found something.
+                               if ( '404' == $error )
+                                       unset( $error, $_GET['error'] );

                        }
 
                        // If req_uri is empty or if it is a request for ourself, unset error.
                        if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
                        }
 
                        // If req_uri is empty or if it is a request for ourself, unset error.
                        if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {

-                               if ( isset($_GET['error']) )
-                                       unset($_GET['error']);
-
-                               if ( isset($error) )
-                                       unset($error);
+                               unset( $error, $_GET['error'] );

 
                                if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
 
                                if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )

-                                       unset($perma_query_vars);
+                                       unset( $perma_query_vars );

 
                                $this->did_permalink = false;
                        }
                }
 
 
                                $this->did_permalink = false;
                        }
                }
 

-               $this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
-
-               foreach ( $GLOBALS['wp_post_types'] as $post_type => $t )
+               /**
+                * Filter the query variables whitelist before processing.
+                *
+                * Allows (publicly allowed) query vars to be added, removed, or 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 to be publicly available.
+                *
+                * @since 1.5.0
+                *
+                * @param array $public_query_vars The array of whitelisted query variables.
+                */
+               $this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
+
+               foreach ( get_post_types( array(), 'objects' ) as $post_type => $t )

                        if ( $t->query_var )
                                $post_type_query_vars[$t->query_var] = $post_type;
 
                        if ( $t->query_var )
                                $post_type_query_vars[$t->query_var] = $post_type;
 


@@ -273,7 +291,7 @@ class WP {
                }
 
                // Convert urldecoded spaces back into +
                }
 
                // Convert urldecoded spaces back into +

-               foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t )
+               foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )

                        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] );
 


@@ -296,9 +314,23 @@ class WP {
                if ( isset($error) )
                        $this->query_vars['error'] = $error;
 
                if ( isset($error) )
                        $this->query_vars['error'] = $error;
 

-               $this->query_vars = apply_filters('request', $this->query_vars);
-
-               do_action_ref_array('parse_request', array(&$this));
+               /**
+                * Filter the array of parsed query variables.
+                *
+                * @since 2.1.0
+                *
+                * @param array $query_vars The array of requested query variables.
+                */
+               $this->query_vars = apply_filters( 'request', $this->query_vars );
+
+               /**
+                * Fires once all query variables for the current request have been parsed.
+                *
+                * @since 2.1.0
+                *
+                * @param WP &$this Current WordPress environment instance (passed by reference).
+                */
+               do_action_ref_array( 'parse_request', array( &$this ) );

        }
 
        /**
        }
 
        /**


@@ -309,23 +341,28 @@ class WP {
         *
         * @since 2.0.0
         */
         *
         * @since 2.0.0
         */

-       function send_headers() {
+       public function send_headers() {

                $headers = array('X-Pingback' => get_bloginfo('pingback_url'));
                $status = null;
                $exit_required = false;
 
                if ( is_user_logged_in() )
                        $headers = array_merge($headers, wp_get_nocache_headers());
                $headers = array('X-Pingback' => get_bloginfo('pingback_url'));
                $status = null;
                $exit_required = false;
 
                if ( is_user_logged_in() )
                        $headers = array_merge($headers, wp_get_nocache_headers());

-               if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
-                       $status = 404;
-                       if ( !is_user_logged_in() )
-                               $headers = array_merge($headers, wp_get_nocache_headers());
-                       $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+               if ( ! empty( $this->query_vars['error'] ) ) {
+                       $status = (int) $this->query_vars['error'];
+                       if ( 404 === $status ) {
+                               if ( ! is_user_logged_in() )
+                                       $headers = array_merge($headers, wp_get_nocache_headers());
+                               $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+                       } elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
+                               $exit_required = true;
+                       }

                } else if ( empty($this->query_vars['feed']) ) {
                        $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
                } else {
                        // We're showing a feed, so WP is indeed the only thing that last changed
                        if ( !empty($this->query_vars['withcomments'])
                } else if ( empty($this->query_vars['feed']) ) {
                        $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
                } else {
                        // We're showing a feed, so WP is indeed the only thing that last changed
                        if ( !empty($this->query_vars['withcomments'])

+                               || false !== strpos( $this->query_vars['feed'], 'comments-' )

                                || ( empty($this->query_vars['withoutcomments'])
                                        && ( !empty($this->query_vars['p'])
                                                || !empty($this->query_vars['name'])
                                || ( empty($this->query_vars['withoutcomments'])
                                        && ( !empty($this->query_vars['p'])
                                                || !empty($this->query_vars['name'])


@@ -345,7 +382,7 @@ class WP {
 
                        // Support for Conditional GET
                        if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
 
                        // Support for Conditional GET
                        if (isset($_SERVER['HTTP_IF_NONE_MATCH']))

-                               $client_etag = stripslashes(stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
+                               $client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );

                        else $client_etag = false;
 
                        $client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
                        else $client_etag = false;
 
                        $client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);


@@ -363,17 +400,52 @@ class WP {
                        }
                }
 
                        }
                }
 

-               $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    Current WordPress environment instance.
+                */
+               $headers = apply_filters( 'wp_headers', $headers, $this );

 
                if ( ! empty( $status ) )
                        status_header( $status );
 
                if ( ! empty( $status ) )
                        status_header( $status );

+
+               // If Last-Modified is set to false, it should not be sent (no-cache situation).
+               if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
+                       unset( $headers['Last-Modified'] );
+
+                       // In PHP 5.3+, make sure we are not sending a Last-Modified header.
+                       if ( function_exists( 'header_remove' ) ) {
+                               @header_remove( 'Last-Modified' );
+                       } else {
+                               // In PHP 5.2, send an empty Last-Modified header, but only as a
+                               // last resort to override a header already sent. #WP23021
+                               foreach ( headers_list() as $header ) {
+                                       if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+                                               $headers['Last-Modified'] = '';
+                                               break;
+                                       }
+                               }
+                       }
+               }
+

                foreach( (array) $headers as $name => $field_value )
                        @header("{$name}: {$field_value}");
 
                if ( $exit_required )
                        exit();
 
                foreach( (array) $headers as $name => $field_value )
                        @header("{$name}: {$field_value}");
 
                if ( $exit_required )
                        exit();
 

-               do_action_ref_array('send_headers', array(&$this));
+               /**
+                * Fires once the requested HTTP headers for caching, content type, etc. have been sent.
+                *
+                * @since 2.1.0
+                *
+                * @param WP &$this Current WordPress environment instance (passed by reference).
+                */
+               do_action_ref_array( 'send_headers', array( &$this ) );

        }
 
        /**
        }
 
        /**


@@ -384,7 +456,7 @@ class WP {
         *
         * @since 2.0.0
         */
         *
         * @since 2.0.0
         */

-       function build_query_string() {
+       public function build_query_string() {

                $this->query_string = '';
                foreach ( (array) array_keys($this->query_vars) as $wpvar) {
                        if ( '' != $this->query_vars[$wpvar] ) {
                $this->query_string = '';
                foreach ( (array) array_keys($this->query_vars) as $wpvar) {
                        if ( '' != $this->query_vars[$wpvar] ) {


@@ -395,9 +467,16 @@ class WP {
                        }
                }
 
                        }
                }
 

-               // 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);
+               if ( has_filter( 'query_string' ) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+                       /**
+                        * Filter the query string before parsing.
+                        *
+                        * @since 1.5.0
+                        * @deprecated 2.1.0 Use 'query_vars' or 'request' filters instead.
+                        *
+                        * @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);
                }
        }
                        parse_str($this->query_string, $this->query_vars);
                }
        }


@@ -410,27 +489,35 @@ class WP {
         * WordPress environment.
         *
         * @global string $query_string Query string for the loop.
         * WordPress environment.
         *
         * @global string $query_string Query string for the loop.

+        * @global array $posts The found posts.
+        * @global WP_Post|null $post The current post, if available.
+        * @global string $request The SQL statement for the request.

         * @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 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
         */
         *
         * @since 2.0.0
         */

-       function register_globals() {
+       public function register_globals() {

                global $wp_query;
                global $wp_query;

+

                // Extract updated query vars back into global namespace.
                // Extract updated query vars back into global namespace.

-               foreach ( (array) $wp_query->query_vars as $key => $value) {
-                       $GLOBALS[$key] = $value;
+               foreach ( (array) $wp_query->query_vars as $key => $value ) {
+                       $GLOBALS[ $key ] = $value;

                }
 
                $GLOBALS['query_string'] = $this->query_string;
                $GLOBALS['posts'] = & $wp_query->posts;
                }
 
                $GLOBALS['query_string'] = $this->query_string;
                $GLOBALS['posts'] = & $wp_query->posts;

-               $GLOBALS['post'] = (isset($wp_query->post)) ? $wp_query->post : null;
+               $GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;

                $GLOBALS['request'] = $wp_query->request;
 
                $GLOBALS['request'] = $wp_query->request;
 

-               if ( is_single() || is_page() ) {
-                       $GLOBALS['more'] = 1;
+               if ( $wp_query->is_single() || $wp_query->is_page() ) {
+                       $GLOBALS['more']   = 1;

                        $GLOBALS['single'] = 1;
                }
                        $GLOBALS['single'] = 1;
                }

+
+               if ( $wp_query->is_author() && isset( $wp_query->post ) )
+                       $GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );

        }
 
        /**
        }
 
        /**


@@ -438,7 +525,7 @@ class WP {
         *
         * @since 2.0.0
         */
         *
         * @since 2.0.0
         */

-       function init() {
+       public function init() {

                wp_get_current_user();
        }
 
                wp_get_current_user();
        }
 


@@ -448,7 +535,7 @@ class WP {
         * @uses WP::$query_vars
         * @since 2.0.0
         */
         * @uses WP::$query_vars
         * @since 2.0.0
         */

-       function query_posts() {
+       public function query_posts() {

                global $wp_the_query;
                $this->build_query_string();
                $wp_the_query->query($this->query_vars);
                global $wp_the_query;
                $this->build_query_string();
                $wp_the_query->query($this->query_vars);


@@ -465,22 +552,46 @@ class WP {
         *
         * @since 2.0.0
         */
         *
         * @since 2.0.0
         */

-       function handle_404() {
+       public function handle_404() {

                global $wp_query;
 
                global $wp_query;
 

-               if ( !is_admin() && ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_robots() && !is_search() && !is_home() ) {
+               // If we've already issued a 404, bail.
+               if ( is_404() )
+                       return;
+
+               // Never 404 for the admin, robots, or if we found posts.
+               if ( is_admin() || is_robots() || $wp_query->posts ) {
+                       status_header( 200 );
+                       return;
+               }
+
+               // We will 404 for paged queries, as no posts were found.
+               if ( ! is_paged() ) {
+
+                       // Don't 404 for authors without posts as long as they matched an author on this site.
+                       $author = get_query_var( 'author' );
+                       if ( is_author() && is_numeric( $author ) && $author > 0 && is_user_member_of_blog( $author ) ) {
+                               status_header( 200 );
+                               return;
+                       }
+

                        // Don't 404 for these queries if they matched an object.
                        // Don't 404 for these queries if they matched an object.

-                       if ( ( is_tag() || is_category() || is_tax() || is_author() ) && $wp_query->get_queried_object() && !is_paged() ) {
-                               if ( !is_404() )
-                                       status_header( 200 );
+                       if ( ( is_tag() || is_category() || is_tax() || is_post_type_archive() ) && get_queried_object() ) {
+                               status_header( 200 );
+                               return;
+                       }
+
+                       // Don't 404 for these queries either.
+                       if ( is_home() || is_search() || is_feed() ) {
+                               status_header( 200 );

                                return;
                        }
                                return;
                        }

-                       $wp_query->set_404();
-                       status_header( 404 );
-                       nocache_headers();
-               } elseif ( !is_404() ) {
-                       status_header( 200 );

                }
                }

+
+               // Guess it's time to 404.
+               $wp_query->set_404();
+               status_header( 404 );
+               nocache_headers();

        }
 
        /**
        }
 
        /**


@@ -494,28 +605,24 @@ class WP {
         *
         * @param string|array $query_args Passed to {@link parse_request()}
         */
         *
         * @param string|array $query_args Passed to {@link parse_request()}
         */

-       function main($query_args = '') {
+       public function main($query_args = '') {

                $this->init();
                $this->parse_request($query_args);
                $this->send_headers();
                $this->query_posts();
                $this->handle_404();
                $this->register_globals();
                $this->init();
                $this->parse_request($query_args);
                $this->send_headers();
                $this->query_posts();
                $this->handle_404();
                $this->register_globals();

-               do_action_ref_array('wp', array(&$this));
-       }

 
 

-       /**
-        * PHP4 Constructor - Does nothing.
-        *
-        * Call main() method when ready to run setup.
-        *
-        * @since 2.0.0
-        *
-        * @return WP
-        */
-       function WP() {
-               // Empty.
+               /**
+                * Fires once the WordPress environment has been set up.
+                *
+                * @since 2.1.0
+                *
+                * @param WP &$this Current WordPress environment instance (passed by reference).
+                */
+               do_action_ref_array( 'wp', array( &$this ) );

        }
        }

+

 }
 
 /**
 }
 
 /**


@@ -530,7 +637,7 @@ class WP_MatchesMapRegex {
         * @access private
         * @var array
         */
         * @access private
         * @var array
         */

-       var $_matches;
+       private $_matches;

 
        /**
         * store for mapping result
 
        /**
         * store for mapping result


@@ -538,7 +645,7 @@ class WP_MatchesMapRegex {
         * @access public
         * @var string
         */
         * @access public
         * @var string
         */

-       var $output;
+       public $output;

 
        /**
         * subject to perform mapping on (query string containing $matches[] references
 
        /**
         * subject to perform mapping on (query string containing $matches[] references


@@ -546,14 +653,80 @@ class WP_MatchesMapRegex {
         * @access private
         * @var string
         */
         * @access private
         * @var string
         */

-       var $_subject;
+       private $_subject;

 
        /**
         * regexp pattern to match $matches[] references
         *
         * @var string
         */
 
        /**
         * regexp pattern to match $matches[] references
         *
         * @var string
         */

-       var $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
+       public $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
+
+       /**
+        * Make private properties readable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name Property to get.
+        * @return mixed Property.
+        */
+       public function __get( $name ) {
+               return $this->$name;
+       }
+
+       /**
+        * Make private properties settable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name  Property to set.
+        * @param mixed  $value Property value.
+        * @return mixed Newly-set property.
+        */
+       public function __set( $name, $value ) {
+               return $this->$name = $value;
+       }
+
+       /**
+        * Make private properties checkable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name Property to check if set.
+        * @return bool Whether the property is set.
+        */
+       public function __isset( $name ) {
+               return isset( $this->$name );
+       }
+
+       /**
+        * Make private properties un-settable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name Property to unset.
+        */
+       public function __unset( $name ) {
+               unset( $this->$name );
+       }
+
+       /**
+        * Make private/protected methods readable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param callable $name      Method to call.
+        * @param array    $arguments Arguments to pass when calling.
+        * @return mixed|bool Return value of the callback, false otherwise.
+        */
+       public function __call( $name, $arguments ) {
+               return call_user_func_array( array( $this, $name ), $arguments );
+       }

 
        /**
         * constructor
 
        /**
         * constructor


@@ -562,7 +735,7 @@ class WP_MatchesMapRegex {
         * @param array  $matches data to use in map
         * @return self
         */
         * @param array  $matches data to use in map
         * @return self
         */

-       function WP_MatchesMapRegex($subject, $matches) {
+       public function WP_MatchesMapRegex($subject, $matches) {

                $this->_subject = $subject;
                $this->_matches = $matches;
                $this->output = $this->_map();
                $this->_subject = $subject;
                $this->_matches = $matches;
                $this->output = $this->_map();


@@ -575,11 +748,11 @@ class WP_MatchesMapRegex {
         *
         * @access public
         * @param string $subject subject
         *
         * @access public
         * @param string $subject subject

-        * @param array  $matches data used for subsitution
+        * @param array  $matches data used for substitution

         * @return string
         */
         * @return string
         */

-       function apply($subject, $matches) {
-               $oSelf =& new WP_MatchesMapRegex($subject, $matches);
+       public static function apply($subject, $matches) {
+               $oSelf = new WP_MatchesMapRegex($subject, $matches);

                return $oSelf->output;
        }
 
                return $oSelf->output;
        }
 


@@ -589,8 +762,8 @@ class WP_MatchesMapRegex {
         * @access private
         * @return string
         */
         * @access private
         * @return string
         */

-       function _map() {
-               $callback = array(&$this, 'callback');
+       private function _map() {
+               $callback = array($this, 'callback');

                return preg_replace_callback($this->_pattern, $callback, $this->_subject);
        }
 
                return preg_replace_callback($this->_pattern, $callback, $this->_subject);
        }
 


@@ -601,11 +774,9 @@ class WP_MatchesMapRegex {
         * @param  array $matches preg_replace regexp matches
         * @return string
         */
         * @param  array $matches preg_replace regexp matches
         * @return string
         */

-       function callback($matches) {
+       public function callback($matches) {

                $index = intval(substr($matches[0], 9, -1));
                return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
        }
 
 }
                $index = intval(substr($matches[0], 9, -1));
                return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
        }
 
 }

-
-?>