mirror of
https://github.com/WordPress/WordPress.git
synced 2025-02-16 19:46:21 +00:00
Apache 1.3 does not support the reluctant (non-greedy) expression modifier. Remove the modifier when outputting mod_rewrite rules.
git-svn-id: http://svn.automattic.com/wordpress/trunk@1615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
1f40b73c6e
commit
fda8478485
@ -1331,7 +1331,8 @@ function generate_rewrite_rules($permalink_structure = '', $matches = '') {
|
|||||||
$post_rewrite = array($feedmatch => $feedquery, $pagematch => $pagequery, $match => $query) + $post_rewrite;
|
$post_rewrite = array($feedmatch => $feedquery, $pagematch => $pagequery, $match => $query) + $post_rewrite;
|
||||||
|
|
||||||
if ($post) {
|
if ($post) {
|
||||||
$post_rewrite = array($trackbackmatch => $trackbackquery) + $post_rewrite;
|
$post_rewrite = array($trackbackmatch =top
|
||||||
|
> $trackbackquery) + $post_rewrite;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1442,6 +1443,9 @@ function mod_rewrite_rules ($permalink_structure) {
|
|||||||
$rules .= "RewriteBase $home_root\n";
|
$rules .= "RewriteBase $home_root\n";
|
||||||
$rewrite = rewrite_rules('', $permalink_structure);
|
$rewrite = rewrite_rules('', $permalink_structure);
|
||||||
foreach ($rewrite as $match => $query) {
|
foreach ($rewrite as $match => $query) {
|
||||||
|
// Apache 1.3 does not support the reluctant (non-greedy) modifier.
|
||||||
|
$match = str_replace('.+?', '.+', $match);
|
||||||
|
|
||||||
if (strstr($query, 'index.php')) {
|
if (strstr($query, 'index.php')) {
|
||||||
$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA]\n";
|
$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA]\n";
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user