Parse REQUEST_URI as a permalink if it looks permalinkish. Use reduced mod_rewrite rules by default.
git-svn-id: http://svn.automattic.com/wordpress/trunk@2635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a08b652698
commit
8f00d317de
|
@ -626,9 +626,10 @@ class WP_Query {
|
|||
$this->queried_object_id = 0;
|
||||
|
||||
if ($this->is_category) {
|
||||
$category = &get_category($this->get('cat'));
|
||||
$cat = $this->get('cat');
|
||||
$category = &get_category($cat);
|
||||
$this->queried_object = &$category;
|
||||
$this->queried_object_id = $this->get('cat');
|
||||
$this->queried_object_id = $cat;
|
||||
} else if ($this->is_single) {
|
||||
$this->queried_object = $this->post;
|
||||
$this->queried_object_id = $this->post->ID;
|
||||
|
@ -753,6 +754,7 @@ class WP_Rewrite {
|
|||
var $index = 'index.php';
|
||||
var $matches = '';
|
||||
var $rules;
|
||||
var $use_verbose_rules = false;
|
||||
var $rewritecode =
|
||||
array(
|
||||
'%year%',
|
||||
|
@ -1219,6 +1221,8 @@ class WP_Rewrite {
|
|||
$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);
|
||||
|
@ -1242,6 +1246,12 @@ class WP_Rewrite {
|
|||
$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}\n";
|
||||
}
|
||||
|
||||
$rules .= "</IfModule>\n";
|
||||
|
||||
$rules = apply_filters('mod_rewrite_rules', $rules);
|
||||
|
@ -1303,12 +1313,16 @@ class WP {
|
|||
if (! empty($extra_query_vars))
|
||||
parse_str($extra_query_vars, $extra_query_vars);
|
||||
|
||||
// Process PATH_INFO and 404.
|
||||
// Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
|
||||
if ((isset($_GET['error']) && $_GET['error'] == '404') ||
|
||||
((! empty($_SERVER['PATH_INFO'])) &&
|
||||
('/' != $_SERVER['PATH_INFO']) &&
|
||||
(false === strpos($_SERVER['PATH_INFO'], '.php'))
|
||||
)) {
|
||||
) ||
|
||||
(empty($_SERVER['QUERY_STRING']) &&
|
||||
(false === strpos($_SERVER['REQUEST_URI'], '.php')) &&
|
||||
('/' != $_SERVER['REQUEST_URI']))
|
||||
) {
|
||||
|
||||
$this->did_permalink = true;
|
||||
|
||||
|
|
Loading…
Reference in New Issue