[wp-cvs] wordpress wp-blog-header.php,1.103,1.104

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4730

Modified Files:
	wp-blog-header.php 
Log Message:
Do not attempt path info matching if PATH_INFO contains SCRIPT_NAME.  Bug 353.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** wp-blog-header.php	3 Dec 2004 02:38:10 -0000	1.103
--- wp-blog-header.php	4 Dec 2004 00:09:40 -0000	1.104
***************
*** 13,17 ****
  // Process PATH_INFO and 404.
  if ((isset($_GET['error']) && $_GET['error'] == '404') ||
!     (! empty( $_SERVER['PATH_INFO']) && '/' != $_SERVER['PATH_INFO'])) {
  
  	// If we match a rewrite rule, this will be cleared.
--- 13,20 ----
  // Process PATH_INFO and 404.
  if ((isset($_GET['error']) && $_GET['error'] == '404') ||
! 		((! empty($_SERVER['PATH_INFO'])) &&
! 		('/' != $_SERVER['PATH_INFO']) &&
! 		(false === strpos($_SERVER['PATH_INFO'], $_SERVER['SCRIPT_NAME']))
! 		)) {
  
  	// If we match a rewrite rule, this will be cleared.
***************
*** 82,85 ****
--- 85,90 ----
  $wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','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');
  
+ $wpvarstoreset = apply_filters('query_vars', $wpvarstoreset);
+ 
  for ($i=0; $i<count($wpvarstoreset); $i += 1) {
  	$wpvar = $wpvarstoreset[$i];