Wordpress 3.7

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

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index b1b1e2876e301b26441d011eb0731f4f42bd5347..05fd43ef6b530f4b75da0c2e976d410f11154f94 100644 (file)
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -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');
+       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', 'post_parent__in', 'post_parent__not_in' );

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


@@ -141,22 +141,13 @@ 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
                        // front. For path info requests, this leaves us with the requesting
 
                        // Trim path info from the end and the leading home path from the
                        // front. For path info requests, this leaves us with the requesting


@@ -247,7 +238,7 @@ class WP {
 
                $this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 
 
                $this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 

-               foreach ( $GLOBALS['wp_post_types'] as $post_type => $t )
+               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;
 


@@ -280,7 +271,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] );
 


@@ -337,6 +328,7 @@ class WP {
                } else {
                        // We're showing a feed, so WP is indeed the only thing that last changed
                        if ( !empty($this->query_vars['withcomments'])
                } 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'])


@@ -356,7 +348,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']);


@@ -378,12 +370,29 @@ class WP {
 
                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}");
 
                foreach( (array) $headers as $name => $field_value )
                        @header("{$name}: {$field_value}");
 

-               if ( isset( $headers['Last-Modified'] ) && empty( $headers['Last-Modified'] ) && function_exists( 'header_remove' ) )
-                       @header_remove( 'Last-Modified' );
-

                if ( $exit_required )
                        exit();
 
                if ( $exit_required )
                        exit();
 


@@ -424,27 +433,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
         */
        function register_globals() {
                global $wp_query;
         *
         * @since 2.0.0
         */
        function register_globals() {
                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 );

        }
 
        /**
        }
 
        /**