Index: wp-includes/rewrite.php
===================================================================
--- wp-includes/rewrite.php	(revision 0)
+++ wp-includes/rewrite.php	(revision 0)
@@ -0,0 +1,789 @@
+<?php
+
+/* WP_Rewrite API
+*******************************************************************************/
+
+//Add a straight rewrite rule
+function add_rewrite_rule($regex, $redirect) {
+	global $wp_rewrite;
+	$wp_rewrite->add_extra_rule($regex, $redirect);
+}
+
+//Add a new tag (like %postname%)
+//warning: you must call this on init or earlier, otherwise the query var addition stuff won't work
+function add_rewrite_tag($tagname, $regex) {
+	//validation
+	if (strlen($tagname) < 3 || $tagname{0} != '%' || $tagname{strlen($tagname)-1} != '%') {
+		return;
+	}
+	
+	$qv = trim($tagname, '%');
+	
+	global $wp_rewrite, $wp;
+	$wp->add_extra_qv($qv);
+	$wp_rewrite->add_rewrite_tag($tagname, $regex, $qv . '=');
+}
+
+//Add a new feed type like /atom1/ 
+function add_feed($feedname, $filename) {
+	global $wp_rewrite;
+	if (!in_array($feedname, $wp_rewrite->feeds)) { //override the file if it is
+		$wp_rewrite->feeds[] = $feedname;
+	}
+	$wp_rewrite->feed_files[$feedname] = $filename;
+}
+
+define('EP_PERMALINK',  1  );
+define('EP_DATE',       2  );
+define('EP_ROOT',       4  );
+define('EP_COMMENTS',   8  );
+define('EP_SEARCH',     16 );
+define('EP_CATEGORIES', 32 );
+define('EP_AUTHORS',    64 );
+define('EP_PAGES',      128);
+//pseudo-places
+define('EP_NONE',       0  );
+define('EP_ALL',        255);
+
+//and an endpoint, like /trackback/
+function add_endpoint($name, $places) {
+	global $wp_rewrite;
+	$wp_rewrite->add_endpoint($name, $func, $places);
+}
+
+/* WP_Rewrite class
+*******************************************************************************/
+
+class WP_Rewrite {
+	var $permalink_structure;
+	var $category_base;
+	var $category_structure;
+	var $author_base = 'author';
+	var $author_structure;
+	var $date_structure;
+	var $page_structure;
+	var $search_base = 'search';
+	var $search_structure;
+	var $comments_base = 'comments';
+	var $feed_base = 'feed';
+	var $comments_feed_structure;
+	var $feed_structure;
+	var $front;
+	var $root = '';
+	var $index = 'index.php';
+	var $matches = '';
+	var $rules;
+	var $extra_rules; //those not generated by the class, see add_rewrite_rule()
+	var $non_wp_rules; //rules that don't redirect to WP's index.php
+	var $endpoints;
+	var $use_verbose_rules = false;
+	var $rewritecode = 
+		array(
+					'%year%',
+					'%monthnum%',
+					'%day%',
+					'%hour%',
+					'%minute%',
+					'%second%',
+					'%postname%',
+					'%post_id%',
+					'%category%',
+					'%author%',
+					'%pagename%',
+					'%search%'
+					);
+
+	var $rewritereplace = 
+		array(
+					'([0-9]{4})',
+					'([0-9]{1,2})',
+					'([0-9]{1,2})',
+					'([0-9]{1,2})',
+					'([0-9]{1,2})',
+					'([0-9]{1,2})',
+					'([^/]+)',
+					'([0-9]+)',
+					'(.+?)',
+					'([^/]+)',
+					'([^/]+)',
+					'(.+)'
+					);
+
+	var $queryreplace = 
+		array (
+					'year=',
+					'monthnum=',
+					'day=',
+					'hour=',
+					'minute=',
+					'second=',
+					'name=',
+					'p=',
+					'category_name=',
+					'author_name=',
+					'pagename=',
+					's='
+					);
+
+	var $feeds = array ( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+	
+	//the filenames aren't actually used in WP_Rewrite but seems a convenient place as any to store them
+	var $feed_files = array (
+		'rdf'  => 'wp-rdf.php',
+	 	'rss'  => 'wp-rss.php',
+	 	'rss2' => 'wp-rss2.php',
+	 	'atom' =>'wp-atom.php'
+	);  
+     
+	function using_permalinks() {
+		if (empty($this->permalink_structure))
+			return false;
+		else
+			return true;
+	}
+
+	function using_index_permalinks() {
+		if (empty($this->permalink_structure)) {
+			return false;
+		}
+
+		// If the index is not in the permalink, we're using mod_rewrite.
+		if (preg_match('#^/*' . $this->index . '#', $this->permalink_structure)) {
+			return true;
+		}
+    
+		return false;
+	}
+
+	function using_mod_rewrite_permalinks() {
+		if ( $this->using_permalinks() && ! $this->using_index_permalinks())
+			return true;
+		else
+			return false;
+	}
+
+	function preg_index($number) {
+		$match_prefix = '$';
+		$match_suffix = '';
+
+		if (! empty($this->matches)) {
+			$match_prefix = '$' . $this->matches . '['; 
+			$match_suffix = ']';
+		}        
+
+		return "$match_prefix$number$match_suffix";        
+	}
+
+	function page_rewrite_rules() {
+		$uris = get_settings('page_uris');
+		$attachment_uris = get_settings('page_attachment_uris');
+
+		$rewrite_rules = array();
+		$page_structure = $this->get_page_permastruct();
+		if( is_array( $attachment_uris ) ) {
+			foreach ($attachment_uris as $uri => $pagename) {
+				$this->add_rewrite_tag('%pagename%', "($uri)", 'attachment=');
+				$rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
+			}
+		}
+		if( is_array( $uris ) ) {
+			foreach ($uris as $uri => $pagename) {
+				$this->add_rewrite_tag('%pagename%', "($uri)", 'pagename=');
+				$rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
+			}
+		}
+
+		return $rewrite_rules;
+	}
+
+	function get_date_permastruct() {
+		if (isset($this->date_structure)) {
+			return $this->date_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->date_structure = '';
+			return false;
+		}
+
+		// The date permalink must have year, month, and day separated by slashes.
+		$endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%');
+
+		$this->date_structure = '';
+		$date_endian = '';
+
+		foreach ($endians as $endian) {
+			if (false !== strpos($this->permalink_structure, $endian)) {
+				$date_endian= $endian;
+				break;
+			}
+		} 
+
+		if ( empty($date_endian) )
+			$date_endian = '%year%/%monthnum%/%day%';
+
+		// Do not allow the date tags and %post_id% to overlap in the permalink
+		// structure. If they do, move the date tags to $front/date/.  
+		$front = $this->front;
+		preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
+		$tok_index = 1;
+		foreach ($tokens[0] as $token) {
+			if ( ($token == '%post_id%') && ($tok_index <= 3) ) {
+				$front = $front . 'date/';
+				break;
+			}
+		}
+
+		$this->date_structure = $front . $date_endian;
+
+		return $this->date_structure;
+	}
+
+	function get_year_permastruct() {
+		$structure = $this->get_date_permastruct($this->permalink_structure);
+
+		if (empty($structure)) {
+			return false;
+		}
+
+		$structure = str_replace('%monthnum%', '', $structure);
+		$structure = str_replace('%day%', '', $structure);
+
+		$structure = preg_replace('#/+#', '/', $structure);
+
+		return $structure;
+	}
+
+	function get_month_permastruct() {
+		$structure = $this->get_date_permastruct($this->permalink_structure);
+
+		if (empty($structure)) {
+			return false;
+		}
+
+		$structure = str_replace('%day%', '', $structure);
+
+		$structure = preg_replace('#/+#', '/', $structure);
+
+		return $structure;
+	}
+
+	function get_day_permastruct() {
+		return $this->get_date_permastruct($this->permalink_structure);
+	}
+
+	function get_category_permastruct() {
+		if (isset($this->category_structure)) {
+			return $this->category_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->category_structure = '';
+			return false;
+		}
+
+		if (empty($this->category_base))
+			$this->category_structure = $this->front . 'category/';
+		else
+			$this->category_structure = $this->category_base . '/';
+
+		$this->category_structure .= '%category%';
+
+		return $this->category_structure;
+	}
+
+	function get_author_permastruct() {
+		if (isset($this->author_structure)) {
+			return $this->author_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->author_structure = '';
+			return false;
+		}
+
+		$this->author_structure = $this->front . $this->author_base . '/%author%';
+
+		return $this->author_structure;
+	}
+
+	function get_search_permastruct() {
+		if (isset($this->search_structure)) {
+			return $this->search_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->search_structure = '';
+			return false;
+		}
+
+		$this->search_structure = $this->root . $this->search_base . '/%search%';
+
+		return $this->search_structure;
+	}
+
+	function get_page_permastruct() {
+		if (isset($this->page_structure)) {
+			return $this->page_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->page_structure = '';
+			return false;
+		}
+
+		$this->page_structure = $this->root . '%pagename%';
+
+		return $this->page_structure;
+	}
+
+	function get_feed_permastruct() {
+		if (isset($this->feed_structure)) {
+			return $this->feed_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->feed_structure = '';
+			return false;
+		}
+
+		$this->feed_structure = $this->root . $this->feed_base . '/%feed%';
+
+		return $this->feed_structure;
+	}
+
+	function get_comment_feed_permastruct() {
+		if (isset($this->comment_feed_structure)) {
+			return $this->comment_feed_structure;
+		}
+
+		if (empty($this->permalink_structure)) {
+			$this->comment_feed_structure = '';
+			return false;
+		}
+
+		$this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
+
+		return $this->comment_feed_structure;
+	}
+
+	function add_rewrite_tag($tag, $pattern, $query) {
+		// If the tag already exists, replace the existing pattern and query for
+		// that tag, otherwise add the new tag, pattern, and query to the end of
+		// the arrays.
+		$position = array_search($tag, $this->rewritecode);
+		if (FALSE !== $position && NULL !== $position) {
+			$this->rewritereplace[$position] = $pattern;
+			$this->queryreplace[$position] = $query;
+		} else {
+			$this->rewritecode[] = $tag;
+			$this->rewritereplace[] = $pattern;
+			$this->queryreplace[] = $query;
+		}
+	}
+
+	//the main WP_Rewrite function. generate the rules from permalink structure
+	function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
+		//build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
+		$feedregex2 = '';
+		foreach ($this->feeds as $feed_name) {
+			$feedregex2 .= $feed_name . '|';
+		}
+		$feedregex2 = '(' . trim($feedregex2, '|') .  ')/?$';
+		//$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
+		//and <permalink>/atom are both possible
+		$feedregex = $this->feed_base  . '/' . $feedregex2;
+
+		//build a regex to match the trackback and page/xx parts of URLs
+		$trackbackregex = 'trackback/?$';
+		$pageregex = 'page/?([0-9]{1,})/?$';
+		
+		//build up an array of endpoint regexes to append => queries to append
+		if ($endpoints) {
+			$ep_query_append = array ();
+			foreach ($this->endpoints as $endpoint) { 
+				//match everything after the endpoint name, but allow for nothing to appear there
+				$epmatch = $endpoint[1] . '(/(.*))?/?$';
+				//this will be appended on to the rest of the query for each dir
+				$epquery = '&' . $endpoint[1] . '=' . $this->preg_index(2);
+				$ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
+			}
+		}
+
+		//get everything up to the first rewrite tag
+		$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
+		//build an array of the tags (note that said array ends up being in $tokens[0])
+		preg_match_all('/%.+?%/', $permalink_structure, $tokens);
+
+		$num_tokens = count($tokens[0]);
+
+		$index = $this->index; //probably 'index.php'
+		$feedindex = $index;
+		$trackbackindex = $index;
+		//build a list from the rewritecode and queryreplace arrays, that will look something like
+		//tagname=$matches[i] where i is the current $i
+		for ($i = 0; $i < $num_tokens; ++$i) {
+			if (0 < $i) {
+				$queries[$i] = $queries[$i - 1] . '&';
+			}
+             
+			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
+			$queries[$i] .= $query_token;
+		}
+
+		//get the structure, minus any cruft (stuff that isn't tags) at the front
+		$structure = $permalink_structure;
+		if ($front != '/') {
+			$structure = str_replace($front, '', $structure);
+		}
+		//create a list of dirs to walk over, making rewrite rules for each level
+		//so for example, a $structure of /%year%/%month%/%postname% would create
+		//rewrite rules for /%year%/, /%year%/%month%/ and /%year%/%month%/%postname%
+		$structure = trim($structure, '/');
+		if ($walk_dirs) {
+			$dirs = explode('/', $structure);
+		} else {
+			$dirs[] = $structure;
+		}
+		$num_dirs = count($dirs);
+
+		//strip slashes from the front of $front
+		$front = preg_replace('|^/+|', '', $front);
+
+		//the main workhorse loop
+		$post_rewrite = array();
+		$struct = $front;
+		for ($j = 0; $j < $num_dirs; ++$j) {
+			//get the struct for this dir, and trim slashes off the front
+			$struct .= $dirs[$j] . '/'; //accumulate. see comment near explode('/', $structure) above
+			$struct = ltrim($struct, '/');
+			//replace tags with regexes
+			$match = str_replace($this->rewritecode, $this->rewritereplace, $struct);
+			//make a list of tags, and store how many there are in $num_toks
+			$num_toks = preg_match_all('/%.+?%/', $struct, $toks);
+			//get the 'tagname=$matches[i]'
+			$query = $queries[$num_toks - 1];
+
+			//create query for /page/xx
+			$pagematch = $match . $pageregex;
+			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+
+			//create query for /feed/(feed|atom|rss|rss2|rdf)
+			$feedmatch = $match . $feedregex;
+			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+
+			//create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex)
+			$feedmatch2 = $match . $feedregex2;
+			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+
+			//if asked to, turn the feed queries into comment feed ones
+			if ($forcomments) {
+				$feedquery .= '&withcomments=1';
+				$feedquery2 .= '&withcomments=1';
+			}
+
+			//start creating the array of rewrites for this dir
+			$rewrite = array();
+			if ($feed) //...adding on /feed/ regexes => queries
+				$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
+			if ($paged) //...and /page/xx ones
+				$rewrite = array_merge($rewrite, array($pagematch => $pagequery));
+			
+			//if we've got some tags in this dir
+			if ($num_toks) {
+				$post = false;
+				$page = false;
+				
+				//check to see if this dir is permalink-level: i.e. the structure specifies an 
+				//individual post. Do this by checking it contains at least one of 1) post name,
+				//2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and 
+				//minute all present). Set these flags now as we need them for the endpoints.
+				if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
+						|| strstr($struct, '%pagename%')
+						|| (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
+					$post = true;
+					if  ( strstr($struct, '%pagename%') )
+						$page = true;
+				}
+				
+				//do endpoints
+				if ($endpoints) {
+					foreach ($ep_query_append as $regex => $ep) {
+						//add the endpoints on if 1) it's a permalink and there's flags for a permalink or 2)
+						//it's not a permalink (then we don't do any flag checking as it should have happened in
+						//rewrite_rules())
+						if ($ep[0] & $ep_mask) {
+							$rewrite[$match . $regex] = $index . '?' . $query . $ep[1];
+						}
+					}
+				}
+				
+				//if we're creating rules for a permalink
+				if ($post) {
+					$post = true;
+					//create query and regex for trackback
+					$trackbackmatch = $match . $trackbackregex;
+					$trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
+					//trim slashes from the end of the regex for this dir
+					$match = rtrim($match, '/');
+					//get rid of brackets
+					$submatchbase = str_replace(array('(',')'),'',$match);
+					
+					//add a rule for at attachements, which take the form of <permalink>/some-text
+					$sub1 = $submatchbase . '/([^/]+)/';
+					$sub1tb = $sub1 . $trackbackregex; //add trackback regex
+					$sub1feed = $sub1 . $feedregex; //and /feed/(atom|...)
+					$sub1feed2 = $sub1 . $feedregex2; //and (feed|atom...)
+					//add an ? as we don't have to match that last slash, and finally a $ so we
+					//match to the end of the URL
+					$sub1 .= '?$';
+					
+					//add another rule to match attachments in the explicit form:
+					//<permalink>/attachment/some-text
+					$sub2 = $submatchbase . '/attachment/([^/]+)/';
+					$sub2tb = $sub2 . $trackbackregex; //and add trackbacks,
+					$sub2feed = $sub2 . $feedregex;    //feeds,
+					$sub2feed2 = $sub2 . $feedregex2;  //and feeds again on to this
+					$sub2 .= '?$'; //add a ?$ as above
+					
+					//create queries for these extra tag-ons we've just dealt with
+					$subquery = $index . '?attachment=' . $this->preg_index(1);
+					$subtbquery = $subquery . '&tb=1';
+					$subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
+					
+					//allow URLs like <permalink>/2 for <permalink>/page/2
+					$match = $match . '(/[0-9]+)?/?$';
+					$query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+				} else { //not matching a permalink so this is a lot simpler
+					//close the match and finalise the query
+					$match .= '?$';
+					$query = $index . '?' . $query;
+				}
+				
+				//create the final array for this dir by joining the $rewrite array (which currently
+				//only contains rules/queries for trackback, pages etc) to the main regex/query for
+				//this dir
+				$rewrite = array_merge($rewrite, array($match => $query));
+
+				//if we're matching a permalink, add those extras (attachments etc) on
+				if ($post) {
+					//add trackback
+					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
+					
+					//add regexes/queries for attachments, attachment trackbacks and so on
+					if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
+						$rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery));
+					$rewrite = array_merge($rewrite, array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery));
+				}
+			}
+			//add the rules for this dir to the accumulating $post_rewrite
+			$post_rewrite = array_merge($rewrite, $post_rewrite);
+		}
+		return $post_rewrite; //the finished rules. phew!
+	}
+
+	function generate_rewrite_rule($permalink_structure, $walk_dirs = false) {
+		return $this->generate_rewrite_rules($permalink_structure, EP_NONE, false, false, false, $walk_dirs);
+	}
+
+	/* rewrite_rules
+	 * Construct rewrite matches and queries from permalink structure.
+	 * Returns an associate array of matches and queries.
+	 */
+	function rewrite_rules() {
+		$rewrite = array();
+
+		if (empty($this->permalink_structure)) {
+			return $rewrite;
+		}
+
+		// Post
+		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
+		$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
+
+		// Date
+		$date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
+		$date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
+
+		// Root
+		$root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
+		$root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
+
+		// Comments
+		$comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, true, true, true, false);
+		$comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
+
+		// Search
+		$search_structure = $this->get_search_permastruct();
+		$search_rewrite = $this->generate_rewrite_rules($search_structure, EP_SEARCH);
+		$search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
+
+		// Categories
+		$category_rewrite = $this->generate_rewrite_rules($this->get_category_permastruct(), EP_CATEGORIES);
+		$category_rewrite = apply_filters('category_rewrite_rules', $category_rewrite);
+
+		// Authors
+		$author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
+		$author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
+
+		// Pages
+		$page_rewrite = $this->page_rewrite_rules();
+		$page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
+
+		// Put them together.
+		$this->rules = array_merge($page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+
+		do_action('generate_rewrite_rules', array(&$this));
+		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
+
+		return $this->rules;
+	}
+
+	function wp_rewrite_rules() {
+		$this->rules = get_option('rewrite_rules');
+		if ( empty($this->rules) ) {
+			$this->matches = 'matches';
+			$this->rewrite_rules();
+			update_option('rewrite_rules', $this->rules);
+		}
+
+		return $this->rules;
+	}
+
+	function mod_rewrite_rules() {
+		if ( ! $this->using_permalinks()) {
+			return '';
+		}
+
+		$site_root = parse_url(get_settings('siteurl'));
+		$site_root = trailingslashit($site_root['path']);
+
+		$home_root = parse_url(get_settings('home'));
+		$home_root = trailingslashit($home_root['path']);
+    
+		$rules = "<IfModule mod_rewrite.c>\n";
+		$rules .= "RewriteEngine On\n";
+		$rules .= "RewriteBase $home_root\n";
+		
+		//add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all)
+		foreach ($this->non_wp_rules as $match => $query) {
+			// Apache 1.3 does not support the reluctant (non-greedy) modifier.
+			$match = str_replace('.+?', '.+', $match);
+
+			// If the match is unanchored and greedy, prepend rewrite conditions
+			// to avoid infinite redirects and eclipsing of real files.
+			if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) {
+				//nada.
+			}
+
+			$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+		}
+
+		if ($this->use_verbose_rules) {
+			$this->matches = '';
+			$rewrite = $this->rewrite_rules();
+			$num_rules = count($rewrite);
+			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
+				"RewriteCond %{REQUEST_FILENAME} -d\n" .
+				"RewriteRule ^.*$ - [S=$num_rules]\n";
+
+			foreach ($rewrite as $match => $query) {
+				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
+				$match = str_replace('.+?', '.+', $match);
+
+				// If the match is unanchored and greedy, prepend rewrite conditions
+				// to avoid infinite redirects and eclipsing of real files.
+				if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) {
+					//nada.
+				}
+
+				if (strstr($query, $this->index)) {
+					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				} else {
+					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				}
+			}
+		} else {
+			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
+				"RewriteCond %{REQUEST_FILENAME} !-d\n" .
+				"RewriteRule . {$home_root}{$this->index} [L]\n";
+		}
+
+		$rules .= "</IfModule>\n";
+
+		$rules = apply_filters('mod_rewrite_rules', $rules);
+		$rules = apply_filters('rewrite_rules', $rules);  // Deprecated
+
+		return $rules;
+	}
+	
+	//Add a straight rewrite rule
+	function add_rule($regex, $redirect) {
+		//get everything up to the first ?
+		$index = (strpos($redirect, '?') == false ? strlen($redirect) : strpos($redirect, '?'));
+		$front = substr($redirect, 0, $index);
+		if ($front != $this->index) { //it doesn't redirect to WP's index.php
+			$this->add_external_rule($regex, $redirect);
+		} else {
+			$this->extra_rules[$regex] = $redirect;
+		}
+	}
+	
+	//add a rule that doesn't redirect to index.php
+	function add_external_rule($regex, $redirect) {
+		$this->non_wp_rules[$regex] = $redirect;
+	}
+	
+	//add an endpoint, like /trackback/, to be inserted after certain URL types (specified in $places)
+	function add_endpoint($name, $places) {
+		global $wp;
+		$this->endpoints[] = array ( $places, $name );
+		$wp->add_query_var($name);
+	}
+
+	function flush_rules() {
+		generate_page_uri_index();
+		delete_option('rewrite_rules');
+		$this->wp_rewrite_rules();
+		if ( function_exists('save_mod_rewrite_rules') )
+			save_mod_rewrite_rules();
+	}
+
+	function init() {
+		$this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
+		$this->permalink_structure = get_settings('permalink_structure');
+		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
+		$this->root = '';
+		if ($this->using_index_permalinks()) {
+			$this->root = $this->index . '/';
+		}
+		$this->category_base = get_settings('category_base');
+		unset($this->category_structure);
+		unset($this->author_structure);
+		unset($this->date_structure);
+		unset($this->page_structure);
+		unset($this->search_structure);
+		unset($this->feed_structure);
+		unset($this->comment_feed_structure);
+	}
+
+	function set_permalink_structure($permalink_structure) {
+		if ($permalink_structure != $this->permalink_structure) {
+			update_option('permalink_structure', $permalink_structure);
+			$this->init();
+		}
+	}
+
+	function set_category_base($category_base) {
+		if ($category_base != $this->category_base) {
+			update_option('category_base', $category_base);
+			$this->init();
+		}
+	}
+
+	function WP_Rewrite() {
+		$this->init();
+	}
+}
+
+?>
\ No newline at end of file
Index: wp-includes/classes.php
===================================================================
--- wp-includes/classes.php	(revision 3622)
+++ wp-includes/classes.php	(working copy)
@@ -855,606 +855,6 @@
 
 }
 
-class WP_Rewrite {
-	var $permalink_structure;
-	var $category_base;
-	var $category_structure;
-	var $author_base = 'author';
-	var $author_structure;
-	var $date_structure;
-	var $page_structure;
-	var $search_base = 'search';
-	var $search_structure;
-	var $comments_base = 'comments';
-	var $feed_base = 'feed';
-	var $comments_feed_structure;
-	var $feed_structure;
-	var $front;
-	var $root = '';
-	var $index = 'index.php';
-	var $matches = '';
-	var $rules;
-	var $use_verbose_rules = false;
-	var $rewritecode = 
-		array(
-					'%year%',
-					'%monthnum%',
-					'%day%',
-					'%hour%',
-					'%minute%',
-					'%second%',
-					'%postname%',
-					'%post_id%',
-					'%category%',
-					'%author%',
-					'%pagename%',
-					'%search%'
-					);
-
-	var $rewritereplace = 
-		array(
-					'([0-9]{4})',
-					'([0-9]{1,2})',
-					'([0-9]{1,2})',
-					'([0-9]{1,2})',
-					'([0-9]{1,2})',
-					'([0-9]{1,2})',
-					'([^/]+)',
-					'([0-9]+)',
-					'(.+?)',
-					'([^/]+)',
-					'([^/]+)',
-					'(.+)'
-					);
-
-	var $queryreplace = 
-		array (
-					'year=',
-					'monthnum=',
-					'day=',
-					'hour=',
-					'minute=',
-					'second=',
-					'name=',
-					'p=',
-					'category_name=',
-					'author_name=',
-					'pagename=',
-					's='
-					);
-
-	var $feeds = array ('feed', 'rdf', 'rss', 'rss2', 'atom');
-
-	function using_permalinks() {
-		if (empty($this->permalink_structure))
-			return false;
-		else
-			return true;
-	}
-
-	function using_index_permalinks() {
-		if (empty($this->permalink_structure)) {
-			return false;
-		}
-
-		// If the index is not in the permalink, we're using mod_rewrite.
-		if (preg_match('#^/*' . $this->index . '#', $this->permalink_structure)) {
-			return true;
-		}
-    
-		return false;
-	}
-
-	function using_mod_rewrite_permalinks() {
-		if ( $this->using_permalinks() && ! $this->using_index_permalinks())
-			return true;
-		else
-			return false;
-	}
-
-	function preg_index($number) {
-		$match_prefix = '$';
-		$match_suffix = '';
-
-		if (! empty($this->matches)) {
-			$match_prefix = '$' . $this->matches . '['; 
-			$match_suffix = ']';
-		}        
-
-		return "$match_prefix$number$match_suffix";        
-	}
-
-	function page_rewrite_rules() {
-		$uris = get_settings('page_uris');
-		$attachment_uris = get_settings('page_attachment_uris');
-
-		$rewrite_rules = array();
-		$page_structure = $this->get_page_permastruct();
-		if( is_array( $attachment_uris ) ) {
-			foreach ($attachment_uris as $uri => $pagename) {
-				$this->add_rewrite_tag('%pagename%', "($uri)", 'attachment=');
-				$rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure));
-			}
-		}
-		if( is_array( $uris ) ) {
-			foreach ($uris as $uri => $pagename) {
-				$this->add_rewrite_tag('%pagename%', "($uri)", 'pagename=');
-				$rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure));
-			}
-		}
-
-		return $rewrite_rules;
-	}
-
-	function get_date_permastruct() {
-		if (isset($this->date_structure)) {
-			return $this->date_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->date_structure = '';
-			return false;
-		}
-
-		// The date permalink must have year, month, and day separated by slashes.
-		$endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%');
-
-		$this->date_structure = '';
-		$date_endian = '';
-
-		foreach ($endians as $endian) {
-			if (false !== strpos($this->permalink_structure, $endian)) {
-				$date_endian= $endian;
-				break;
-			}
-		} 
-
-		if ( empty($date_endian) )
-			$date_endian = '%year%/%monthnum%/%day%';
-
-		// Do not allow the date tags and %post_id% to overlap in the permalink
-		// structure. If they do, move the date tags to $front/date/.  
-		$front = $this->front;
-		preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
-		$tok_index = 1;
-		foreach ($tokens[0] as $token) {
-			if ( ($token == '%post_id%') && ($tok_index <= 3) ) {
-				$front = $front . 'date/';
-				break;
-			}
-		}
-
-		$this->date_structure = $front . $date_endian;
-
-		return $this->date_structure;
-	}
-
-	function get_year_permastruct() {
-		$structure = $this->get_date_permastruct($this->permalink_structure);
-
-		if (empty($structure)) {
-			return false;
-		}
-
-		$structure = str_replace('%monthnum%', '', $structure);
-		$structure = str_replace('%day%', '', $structure);
-
-		$structure = preg_replace('#/+#', '/', $structure);
-
-		return $structure;
-	}
-
-	function get_month_permastruct() {
-		$structure = $this->get_date_permastruct($this->permalink_structure);
-
-		if (empty($structure)) {
-			return false;
-		}
-
-		$structure = str_replace('%day%', '', $structure);
-
-		$structure = preg_replace('#/+#', '/', $structure);
-
-		return $structure;
-	}
-
-	function get_day_permastruct() {
-		return $this->get_date_permastruct($this->permalink_structure);
-	}
-
-	function get_category_permastruct() {
-		if (isset($this->category_structure)) {
-			return $this->category_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->category_structure = '';
-			return false;
-		}
-
-		if (empty($this->category_base))
-			$this->category_structure = $this->front . 'category/';
-		else
-			$this->category_structure = $this->category_base . '/';
-
-		$this->category_structure .= '%category%';
-
-		return $this->category_structure;
-	}
-
-	function get_author_permastruct() {
-		if (isset($this->author_structure)) {
-			return $this->author_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->author_structure = '';
-			return false;
-		}
-
-		$this->author_structure = $this->front . $this->author_base . '/%author%';
-
-		return $this->author_structure;
-	}
-
-	function get_search_permastruct() {
-		if (isset($this->search_structure)) {
-			return $this->search_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->search_structure = '';
-			return false;
-		}
-
-		$this->search_structure = $this->root . $this->search_base . '/%search%';
-
-		return $this->search_structure;
-	}
-
-	function get_page_permastruct() {
-		if (isset($this->page_structure)) {
-			return $this->page_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->page_structure = '';
-			return false;
-		}
-
-		$this->page_structure = $this->root . '%pagename%';
-
-		return $this->page_structure;
-	}
-
-	function get_feed_permastruct() {
-		if (isset($this->feed_structure)) {
-			return $this->feed_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->feed_structure = '';
-			return false;
-		}
-
-		$this->feed_structure = $this->root . $this->feed_base . '/%feed%';
-
-		return $this->feed_structure;
-	}
-
-	function get_comment_feed_permastruct() {
-		if (isset($this->comment_feed_structure)) {
-			return $this->comment_feed_structure;
-		}
-
-		if (empty($this->permalink_structure)) {
-			$this->comment_feed_structure = '';
-			return false;
-		}
-
-		$this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
-
-		return $this->comment_feed_structure;
-	}
-
-	function add_rewrite_tag($tag, $pattern, $query) {
-		// If the tag already exists, replace the existing pattern and query for
-		// that tag, otherwise add the new tag, pattern, and query to the end of
-		// the arrays.
-		$position = array_search($tag, $this->rewritecode);
-		if (FALSE !== $position && NULL !== $position) {
-			$this->rewritereplace[$position] = $pattern;
-			$this->queryreplace[$position] = $query;
-		} else {
-			$this->rewritecode[] = $tag;
-			$this->rewritereplace[] = $pattern;
-			$this->queryreplace[] = $query;
-		}
-	}
-
-	function generate_rewrite_rules($permalink_structure, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true) {
-		$feedregex2 = '';
-		foreach ($this->feeds as $feed_name) {
-			$feedregex2 .= $feed_name . '|';
-		}
-		$feedregex2 = '(' . trim($feedregex2, '|') .  ')/?$';
-		$feedregex = $this->feed_base  . '/' . $feedregex2;
-
-		$trackbackregex = 'trackback/?$';
-		$pageregex = 'page/?([0-9]{1,})/?$';
-
-		$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
-		preg_match_all('/%.+?%/', $permalink_structure, $tokens);
-
-		$num_tokens = count($tokens[0]);
-
-		$index = $this->index;
-		$feedindex = $index;
-		$trackbackindex = $index;
-		for ($i = 0; $i < $num_tokens; ++$i) {
-			if (0 < $i) {
-				$queries[$i] = $queries[$i - 1] . '&';
-			}
-             
-			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
-			$queries[$i] .= $query_token;
-		}
-
-		$structure = $permalink_structure;
-		if ($front != '/') {
-			$structure = str_replace($front, '', $structure);
-		}
-		$structure = trim($structure, '/');
-		if ($walk_dirs) {
-			$dirs = explode('/', $structure);
-		} else {
-			$dirs[] = $structure;
-		}
-		$num_dirs = count($dirs);
-
-		$front = preg_replace('|^/+|', '', $front);
-
-		$post_rewrite = array();
-		$struct = $front;
-		for ($j = 0; $j < $num_dirs; ++$j) {
-			$struct .= $dirs[$j] . '/';
-			$struct = ltrim($struct, '/');
-			$match = str_replace($this->rewritecode, $this->rewritereplace, $struct);
-			$num_toks = preg_match_all('/%.+?%/', $struct, $toks);
-			$query = $queries[$num_toks - 1];
-
-			$pagematch = $match . $pageregex;
-			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
-
-			$feedmatch = $match . $feedregex;
-			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
-
-			$feedmatch2 = $match . $feedregex2;
-			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
-
-			if ($forcomments) {
-				$feedquery .= '&withcomments=1';
-				$feedquery2 .= '&withcomments=1';
-			}
-
-			$rewrite = array();
-			if ($feed) 
-				$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
-			if ($paged)
-				$rewrite = array_merge($rewrite, array($pagematch => $pagequery));
-
-			if ($num_toks) {
-				$post = false;
-				$page = false;
-				if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
-						|| strstr($struct, '%pagename%')
-						|| (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
-					$post = true;
-					if  ( strstr($struct, '%pagename%') )
-						$page = true;
-					$trackbackmatch = $match . $trackbackregex;
-					$trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
-					$match = rtrim($match, '/');
-					$submatchbase = str_replace(array('(',')'),'',$match);
-					$sub1 = $submatchbase . '/([^/]+)/';
-					$sub1tb = $sub1 . $trackbackregex;
-					$sub1feed = $sub1 . $feedregex;
-					$sub1feed2 = $sub1 . $feedregex2;
-					$sub1 .= '?$';
-					$sub2 = $submatchbase . '/attachment/([^/]+)/';
-					$sub2tb = $sub2 . $trackbackregex;
-					$sub2feed = $sub2 . $feedregex;
-					$sub2feed2 = $sub2 . $feedregex2;
-					$sub2 .= '?$';
-					$subquery = $index . '?attachment=' . $this->preg_index(1);
-					$subtbquery = $subquery . '&tb=1';
-					$subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-					$match = $match . '(/[0-9]+)?/?$';
-					$query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
-				} else {
-					$match .= '?$';
-					$query = $index . '?' . $query;
-				}
-				        
-				$rewrite = array_merge($rewrite, array($match => $query));
-
-				if ($post) {
-					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
-					if ( ! $page )
-						$rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery));
-					$rewrite = array_merge($rewrite, array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery));
-				}
-			}
-			$post_rewrite = array_merge($rewrite, $post_rewrite);
-		}
-		return $post_rewrite;
-	}
-
-	function generate_rewrite_rule($permalink_structure, $walk_dirs = false) {
-		return $this->generate_rewrite_rules($permalink_structure, false, false, false, $walk_dirs);
-	}
-
-	/* rewrite_rules
-	 * Construct rewrite matches and queries from permalink structure.
-	 * Returns an associate array of matches and queries.
-	 */
-	function rewrite_rules() {
-		$rewrite = array();
-
-		if (empty($this->permalink_structure)) {
-			return $rewrite;
-		}
-
-		// Post
-		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure);
-		$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
-
-		// Date
-		$date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct());
-		$date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
-
-		// Root
-		$root_rewrite = $this->generate_rewrite_rules($this->root . '/');
-		$root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
-
-		// Comments
-		$comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, true, true, true, false);
-		$comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
-
-		// Search
-		$search_structure = $this->get_search_permastruct();
-		$search_rewrite = $this->generate_rewrite_rules($search_structure);
-		$search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
-
-		// Categories
-		$category_rewrite = $this->generate_rewrite_rules($this->get_category_permastruct());
-		$category_rewrite = apply_filters('category_rewrite_rules', $category_rewrite);
-
-		// Authors
-		$author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct());
-		$author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
-
-		// Pages
-		$page_rewrite = $this->page_rewrite_rules();
-		$page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
-
-		// Put them together.
-		$this->rules = array_merge($page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite);
-
-		do_action('generate_rewrite_rules', array(&$this));
-		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
-
-		return $this->rules;
-	}
-
-	function wp_rewrite_rules() {
-		$this->rules = get_option('rewrite_rules');
-		if ( empty($this->rules) ) {
-			$this->matches = 'matches';
-			$this->rewrite_rules();
-			update_option('rewrite_rules', $this->rules);
-		}
-
-		return $this->rules;
-	}
-
-	function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks()) {
-			return '';
-		}
-
-		$site_root = parse_url(get_settings('siteurl'));
-		$site_root = trailingslashit($site_root['path']);
-
-		$home_root = parse_url(get_settings('home'));
-		$home_root = trailingslashit($home_root['path']);
-    
-		$rules = "<IfModule mod_rewrite.c>\n";
-		$rules .= "RewriteEngine On\n";
-		$rules .= "RewriteBase $home_root\n";
-
-		if ($this->use_verbose_rules) {
-			$this->matches = '';
-			$rewrite = $this->rewrite_rules();
-			$num_rules = count($rewrite);
-			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
-				"RewriteCond %{REQUEST_FILENAME} -d\n" .
-				"RewriteRule ^.*$ - [S=$num_rules]\n";
-
-			foreach ($rewrite as $match => $query) {
-				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
-				$match = str_replace('.+?', '.+', $match);
-
-				// If the match is unanchored and greedy, prepend rewrite conditions
-				// to avoid infinite redirects and eclipsing of real files.
-				if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) {
-					//nada.
-				}
-
-				if (strstr($query, $this->index)) {
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
-				} else {
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
-				}
-			}
-		} else {
-			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
-				"RewriteCond %{REQUEST_FILENAME} !-d\n" .
-				"RewriteRule . {$home_root}{$this->index} [L]\n";
-		}
-
-		$rules .= "</IfModule>\n";
-
-		$rules = apply_filters('mod_rewrite_rules', $rules);
-		$rules = apply_filters('rewrite_rules', $rules);  // Deprecated
-
-		return $rules;
-	}
-
-	function flush_rules() {
-		generate_page_uri_index();
-		delete_option('rewrite_rules');
-		$this->wp_rewrite_rules();
-		if ( function_exists('save_mod_rewrite_rules') )
-			save_mod_rewrite_rules();
-	}
-
-	function init() {
-		$this->permalink_structure = get_settings('permalink_structure');
-		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
-		$this->root = '';
-		if ($this->using_index_permalinks()) {
-			$this->root = $this->index . '/';
-		}
-		$this->category_base = get_settings('category_base');
-		unset($this->category_structure);
-		unset($this->author_structure);
-		unset($this->date_structure);
-		unset($this->page_structure);
-		unset($this->search_structure);
-		unset($this->feed_structure);
-		unset($this->comment_feed_structure);
-	}
-
-	function set_permalink_structure($permalink_structure) {
-		if ($permalink_structure != $this->permalink_structure) {
-			update_option('permalink_structure', $permalink_structure);
-			$this->init();
-		}
-	}
-
-	function set_category_base($category_base) {
-		if ($category_base != $this->category_base) {
-			update_option('category_base', $category_base);
-			$this->init();
-		}
-	}
-
-	function WP_Rewrite() {
-		$this->init();
-	}
-}
-
 class WP {
 	var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview');
 
@@ -1467,6 +867,10 @@
 	var $matched_rule;
 	var $matched_query;
 	var $did_permalink = false;
+	
+	function add_query_var($qv) {
+		$this->public_query_vars[] = $qv;
+	}
 
 	function parse_request($extra_query_vars = '') {
 		global $wp_rewrite;
@@ -1539,7 +943,7 @@
 					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);
 
Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 3622)
+++ wp-settings.php	(working copy)
@@ -140,6 +140,7 @@
 require (ABSPATH . WPINC . '/template-functions-post.php');
 require (ABSPATH . WPINC . '/template-functions-category.php');
 require (ABSPATH . WPINC . '/comment-functions.php');
+require (ABSPATH . WPINC . '/rewrite.php');
 require (ABSPATH . WPINC . '/feed-functions.php');
 require (ABSPATH . WPINC . '/template-functions-bookmarks.php');
 require (ABSPATH . WPINC . '/kses.php');
Index: wp-feed.php
===================================================================
--- wp-feed.php	(revision 3622)
+++ wp-feed.php	(working copy)
@@ -12,26 +12,13 @@
     $feed = 'rss2';
 }
 
+$file = $wp_rewrite->feed_files[$feed];
+
 if ( is_single() || ($withcomments == 1) ) {
     require(ABSPATH . 'wp-commentsrss2.php');
-} else {
-    switch ($feed) {
-    case 'atom':
-        require(ABSPATH . 'wp-atom.php');
-        break;
-    case 'rdf':
-        require(ABSPATH . 'wp-rdf.php');
-        break;
-    case 'rss':
-        require(ABSPATH . 'wp-rss.php');
-        break;
-    case 'rss2':
-        require(ABSPATH . 'wp-rss2.php');
-        break;
-    case 'comments-rss2':
-        require(ABSPATH . 'wp-commentsrss2.php');
-        break;
-    }
+} elseif (in_array($feed, $wp_rewrite->feeds) && !empty($file) && file_exists(ABSPATH . $file)) {
+		require ABSPATH . $file;
+	}
 }
 
 ?>