* @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.
* @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', '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.
*
* @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;
}
* @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;
}
*
* @since 2.0.0
*
+ * @global WP_Rewrite $wp_rewrite
+ *
* @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;
/**
$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))
- parse_str($extra_query_vars, $this->extra_query_vars);
-
+ } elseif ( ! empty( $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.
list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
$self = $_SERVER['PHP_SELF'];
$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
+ $home_path_regex = sprintf( '|^%s|i', preg_quote( $home_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
// requested permalink.
$req_uri = str_replace($pathinfo, '', $req_uri);
$req_uri = trim($req_uri, '/');
- $req_uri = preg_replace("|^$home_path|i", '', $req_uri);
+ $req_uri = preg_replace( $home_path_regex, '', $req_uri );
$req_uri = trim($req_uri, '/');
$pathinfo = trim($pathinfo, '/');
- $pathinfo = preg_replace("|^$home_path|i", '', $pathinfo);
+ $pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
$pathinfo = trim($pathinfo, '/');
$self = trim($self, '/');
- $self = preg_replace("|^$home_path|i", '', $self);
+ $self = preg_replace( $home_path_regex, '', $self );
$self = trim($self, '/');
// The requested permalink is in $pathinfo for path info requests and
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;
}
}
}
+ // Resolve conflicts between posts with numeric slugs and date archive queries.
+ $this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+
foreach ( (array) $this->private_query_vars as $var) {
if ( isset($this->extra_query_vars[$var]) )
$this->query_vars[$var] = $this->extra_query_vars[$var];
*
* @since 2.0.0
*/
- function send_headers() {
+ public function send_headers() {
$headers = array('X-Pingback' => get_bloginfo('pingback_url'));
$status = null;
$exit_required = false;
} 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
*
* @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] ) {
* be taken when naming global variables that might interfere with the
* WordPress environment.
*
- * @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.
* @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.
+ * @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() {
+ public function register_globals() {
global $wp_query;
// Extract updated query vars back into global namespace.
*
* @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
+ *
+ * @global WP_Query $wp_the_query
*/
- function query_posts() {
+ public 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.
+ * 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
* Otherwise, issue a 200.
*
* @since 2.0.0
+ *
+ * @global WP_Query $wp_query
*/
- function handle_404() {
+ public function handle_404() {
global $wp_query;
// If we've already issued a 404, bail.
}
// Don't 404 for these queries either.
- if ( is_home() || is_search() ) {
+ if ( is_home() || is_search() || is_feed() ) {
status_header( 200 );
return;
}
*
* @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();
*/
do_action_ref_array( 'wp', array( &$this ) );
}
-
}
/**
* @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
*/
- function WP_MatchesMapRegex($subject, $matches) {
+ public function __construct($subject, $matches) {
$this->_subject = $subject;
$this->_matches = $matches;
$this->output = $this->_map();
*
* static helper function to ease use
*
+ * @static
* @access public
+ *
* @param string $subject subject
* @param array $matches data used for substitution
* @return string
* @access private
* @return string
*/
- function _map() {
+ private function _map() {
$callback = array($this, 'callback');
return preg_replace_callback($this->_pattern, $callback, $this->_subject);
}
* @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]) : '' );
}
-
}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff