enmi-conf.org: comparison wp/wp-includes/class-wp.php

equal deleted inserted replaced

-:346c88efed21
+:5e2f62d02dcd
 	 *
 	 * @since 2.0.0
 	 * @access public
 	 * @var array
 	 */
-	var $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');
+	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.
 	 *
 	 * Long list of private query variables.
 	 *
 	 * @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', 'post_parent__in', 'post_parent__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.
 	 *
 	 * @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.
 	 *
 	 * @since 2.0.0
 	 * @var array
 	 */
-	var $query_vars;
+	public $query_vars;
 	/**
 	 * String parsed to set the query variables.
 	 *
 	 * @since 2.0.0
 	 * @var string
 	 */
-	var $query_string;
+	public $query_string;
 	/**
 	 * Permalink or requested URI.
 	 *
 	 * @since 2.0.0
 	 * @var string
 	 */
-	var $request;
+	public $request;
 	/**
 	 * Rewrite rule the request matched.
 	 *
 	 * @since 2.0.0
 	 * @var string
 	 */
-	var $matched_rule;
+	public $matched_rule;
 	/**
 	 * Rewrite query the request matched.
 	 *
 	 * @since 2.0.0
 	 * @var string
 	 */
-	var $matched_query;
+	public $matched_query;
 	/**
 	 * Whether already did the permalink.
 	 *
 	 * @since 2.0.0
 	 * @var bool
 	 */
-	var $did_permalink = false;
+	public $did_permalink = false;
 	/**
 	 * Add name to list of public query variables.
 	 *
 	 * @since 2.1.0
 	 *
 	 * @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;
 	}
 	/**
 	 * @since 2.3.0
 	 *
 	 * @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;
 	}
 	/**
 	 * Parse request to find correct WordPress query.
 	 *
 	 * @since 2.0.0
 	 *
 	 * @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;
+		/**
+		 * 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();
-		if ( is_array($extra_query_vars) )
+		if ( is_array( $extra_query_vars ) ) {
 			$this->extra_query_vars = & $extra_query_vars;
-		else if (! empty($extra_query_vars))
+		} elseif ( ! empty( $extra_query_vars ) ) {
-			parse_str($extra_query_vars, $this->extra_query_vars);
+			parse_str( $extra_query_vars, $this->extra_query_vars );
+		}
 		// Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 		// Fetch the rewrite rules.
 		$rewrite = $wp_rewrite->wp_rewrite_rules();
 					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
+							// This is a verbose page match, let's check to be sure about it.
 							if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
 						 		continue;
 						}
 						// Got a match.
 				$this->did_permalink = false;
 			}
 		}
-		$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 ( get_post_types( array(), 'objects' ) as $post_type => $t )
 			if ( $t->query_var )
 				$post_type_query_vars[$t->query_var] = $post_type;
 		}
 		if ( isset($error) )
 			$this->query_vars['error'] = $error;
-		$this->query_vars = apply_filters('request', $this->query_vars);
+		/**
+		 * Filter the array of parsed query variables.
-		do_action_ref_array('parse_request', array(&$this));
+		 *
+		 * @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 ) );
 	}
 	/**
 	 * Send additional HTTP headers for caching, content type, etc.
 	 *
 	 * Sets the X-Pingback header, 404 status (if 404), Content-type. If showing
 	 * a feed, it will also send last-modified, etag, and 304 status if needed.
 	 *
 	 * @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['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']) ) {
+		} elseif ( 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-' )
 				$status = 304;
 				$exit_required = true;
 			}
 		}
-		$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 Last-Modified is set to false, it should not be sent (no-cache situation).
 			@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 ) );
 	}
 	/**
 	 * Sets the query string property based off of the query variable property.
 	 *
 	 * The 'query_string' filter is deprecated, but still works. Plugins should
 	 * use the 'request' filter instead.
 	 *
 	 * @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 .= (strlen($this->query_string) < 1) ? '' : '&';
 				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
 					continue;
 				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
-		// 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.
-		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.
+			 *
+			 * @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);
 		}
 	}
 	/**
 	 * @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() {
+	public 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;
 	/**
 	 * Set up the current user.
 	 *
 	 * @since 2.0.0
 	 */
-	function init() {
+	public function init() {
 		wp_get_current_user();
 	}
 	/**
 	 * Set up the Loop based on the query variables.
 	 *
-	 * @uses WP::$query_vars
+	 * @since 2.0.0
-	 * @since 2.0.0
+	 */
-	 */
+	public function query_posts() {
-	function query_posts() {
 		global $wp_the_query;
 		$this->build_query_string();
 		$wp_the_query->query($this->query_vars);
 	}
 	/**
 	 * Set the Headers for 404, if nothing is found for requested URL.
 	 *
 	 * Issue a 404 if a request doesn't match any posts and doesn't match
 	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
 	 * issued, and if the request was not a search or the homepage.
 	 *
 	 * Otherwise, issue a 200.
 	 *
 	 * @since 2.0.0
 	 */
-	function handle_404() {
+	public function handle_404() {
 		global $wp_query;
 		// If we've already issued a 404, bail.
 		if ( is_404() )
 			return;
 		}
 		// We will 404 for paged queries, as no posts were found.
 		if ( ! is_paged() ) {
-			// Don't 404 for these queries if they matched an object.
+			// Don't 404 for authors without posts as long as they matched an author on this site.
-			if ( ( is_tag() || is_category() || is_tax() || is_author() || is_post_type_archive() ) && $wp_query->get_queried_object() ) {
+			$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_post_type_archive() ) && get_queried_object() ) {
+				status_header( 200 );
+				return;
+			}
 			// Don't 404 for these queries either.
-			if ( is_home() || is_search() ) {
+			if ( is_home() || is_search() || is_feed() ) {
 				status_header( 200 );
 				return;
 			}
 		}
 	 *
 	 * @since 2.0.0
 	 *
 	 * @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();
-		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 ) );
 	}
 }
 /**
 	 * store for matches
 	 *
 	 * @access private
 	 * @var array
 	 */
-	var $_matches;
+	private $_matches;
 	/**
 	 * store for mapping result
 	 *
 	 * @access public
 	 * @var string
 	 */
-	var $output;
+	public $output;
 	/**
 	 * subject to perform mapping on (query string containing $matches[] references
 	 *
 	 * @access private
 	 * @var string
 	 */
-	var $_subject;
+	private $_subject;
 	/**
 	 * 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
 	/**
 	 * constructor
 	 *
 	 * @param string $subject subject if regex
 	 * @param array  $matches data to use in map
-	 * @return self
+	 */
-	 */
+	public function __construct($subject, $matches) {
-	function WP_MatchesMapRegex($subject, $matches) {
 		$this->_subject = $subject;
 		$this->_matches = $matches;
 		$this->output = $this->_map();
 	}
 	 * do the actual mapping
 	 *
 	 * @access private
 	 * @return string
 	 */
-	function _map() {
+	private function _map() {
 		$callback = array($this, 'callback');
 		return preg_replace_callback($this->_pattern, $callback, $this->_subject);
 	}
 	/**
 	 *
 	 * @access public
 	 * @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]) : '' );
 	}
 }

changeset 5	5e2f62d02dcd
parent 0	d970ebf37754
child 7	cf61fcea0001