WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@1909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rboren 2004-12-04 00:09:40 +00:00
parent b1a4a04126
commit 02f33a3426
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-blog-header.php
View File

@ -12,7 +12,10 @@ $query_vars = array();
// Process PATH_INFO and 404. // Process PATH_INFO and 404.
if ((isset($_GET['error']) && $_GET['error'] == '404') || if ((isset($_GET['error']) && $_GET['error'] == '404') ||
(! empty( $_SERVER['PATH_INFO']) && '/' != $_SERVER['PATH_INFO'])) { ((! 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. // If we match a rewrite rule, this will be cleared.
$error = '404'; $error = '404';
@ -81,6 +84,8 @@ if ((isset($_GET['error']) && $_GET['error'] == '404') ||
$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 = 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) { for ($i=0; $i<count($wpvarstoreset); $i += 1) {
$wpvar = $wpvarstoreset[$i]; $wpvar = $wpvarstoreset[$i];
if (!isset($$wpvar)) { if (!isset($$wpvar)) {