Archived
Updates bonanza
This commit is contained in:
1 parent
d26191c9f8
commit
9d480fc3c5
1366 files changed
+220321
-90180
No files matched your search
+105
-34
@@ -25,7 +25,7 @@ class WP {
|
||||
* @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', 'post_parent__in', 'post_parent__not_in' );
|
||||
|
||||
/**
|
||||
* Extra query variables set by the user.
|
||||
@@ -120,6 +120,15 @@ class WP {
|
||||
function parse_request($extra_query_vars = '') {
|
||||
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;
|
||||
|
||||
@@ -141,22 +150,13 @@ class WP {
|
||||
$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'];
|
||||
$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
|
||||
@@ -245,9 +245,20 @@ class WP {
|
||||
}
|
||||
}
|
||||
|
||||
$this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
|
||||
/**
|
||||
* 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 ( $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;
|
||||
|
||||
@@ -280,7 +291,7 @@ class WP {
|
||||
}
|
||||
|
||||
// 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] );
|
||||
|
||||
@@ -303,9 +314,23 @@ class WP {
|
||||
if ( isset($error) )
|
||||
$this->query_vars['error'] = $error;
|
||||
|
||||
$this->query_vars = apply_filters('request', $this->query_vars);
|
||||
/**
|
||||
* 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 );
|
||||
|
||||
do_action_ref_array('parse_request', array(&$this));
|
||||
/**
|
||||
* 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 ) );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -337,6 +362,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'])
|
||||
|| false !== strpos( $this->query_vars['feed'], 'comments-' )
|
||||
|| ( empty($this->query_vars['withoutcomments'])
|
||||
&& ( !empty($this->query_vars['p'])
|
||||
|| !empty($this->query_vars['name'])
|
||||
@@ -356,7 +382,7 @@ class WP {
|
||||
|
||||
// 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']);
|
||||
@@ -374,7 +400,15 @@ 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 );
|
||||
@@ -404,7 +438,14 @@ class WP {
|
||||
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 ) );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -426,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);
|
||||
}
|
||||
}
|
||||
@@ -441,27 +489,35 @@ class WP {
|
||||
* 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 WP_User $authordata Only set, if author archive.
|
||||
*
|
||||
* @since 2.0.0
|
||||
*/
|
||||
function register_globals() {
|
||||
global $wp_query;
|
||||
|
||||
// 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['post'] = (isset($wp_query->post)) ? $wp_query->post : null;
|
||||
$GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;
|
||||
$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;
|
||||
}
|
||||
|
||||
if ( $wp_query->is_author() && isset( $wp_query->post ) )
|
||||
$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -512,8 +568,15 @@ class WP {
|
||||
// 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.
|
||||
if ( ( is_tag() || is_category() || is_tax() || is_author() || is_post_type_archive() ) && $wp_query->get_queried_object() ) {
|
||||
if ( ( is_tag() || is_category() || is_tax() || is_post_type_archive() ) && get_queried_object() ) {
|
||||
status_header( 200 );
|
||||
return;
|
||||
}
|
||||
@@ -549,7 +612,15 @@ class WP {
|
||||
$this->query_posts();
|
||||
$this->handle_404();
|
||||
$this->register_globals();
|
||||
do_action_ref_array('wp', array(&$this));
|
||||
|
||||
/**
|
||||
* 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 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user