Changeset 1909

Show
Ignore:
Timestamp:
12/04/04 00:09:40 (4 years ago)
Author:
rboren
Message:

Do not attempt path info matching if PATH_INFO contains SCRIPT_NAME. Bug 353.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-blog-header.php

    r1908 r1909  
    1313// Process PATH_INFO and 404. 
    1414if ((isset($_GET['error']) && $_GET['error'] == '404') || 
    15     (! empty( $_SERVER['PATH_INFO']) && '/' != $_SERVER['PATH_INFO'])) { 
     15        ((! empty($_SERVER['PATH_INFO'])) && 
     16        ('/' != $_SERVER['PATH_INFO']) && 
     17        (false === strpos($_SERVER['PATH_INFO'], $_SERVER['SCRIPT_NAME'])) 
     18        )) { 
    1619 
    1720    // If we match a rewrite rule, this will be cleared. 
     
    8184 
    8285$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'); 
     86 
     87$wpvarstoreset = apply_filters('query_vars', $wpvarstoreset); 
    8388 
    8489for ($i=0; $i<count($wpvarstoreset); $i += 1) {