rewrite_rules() tweaks. Use rewrite_rules() in options-permalink.php.
git-svn-id: http://svn.automattic.com/wordpress/trunk@963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
699dcb6ac8
commit
6f2c205b0b
|
@ -100,99 +100,16 @@ $site_root = str_replace('http://', '', trim(get_settings('siteurl')));
|
||||||
$site_root = preg_replace('|([^/]*)(.*)|i', '$2', $site_root);
|
$site_root = preg_replace('|([^/]*)(.*)|i', '$2', $site_root);
|
||||||
if ('/' != substr($site_root, -1)) $site_root = $site_root . '/';
|
if ('/' != substr($site_root, -1)) $site_root = $site_root . '/';
|
||||||
|
|
||||||
$rewritecode = array(
|
|
||||||
'%year%',
|
|
||||||
'%monthnum%',
|
|
||||||
'%day%',
|
|
||||||
'%postname%',
|
|
||||||
'%post_id%'
|
|
||||||
);
|
|
||||||
$rewritereplace = array(
|
|
||||||
'([0-9]{4})?',
|
|
||||||
'([0-9]{1,2})?',
|
|
||||||
'([0-9]{1,2})?',
|
|
||||||
'([0-9a-z-_]+)?',
|
|
||||||
'([0-9]+)?'
|
|
||||||
);
|
|
||||||
$queryreplace = array (
|
|
||||||
'year=',
|
|
||||||
'monthnum=',
|
|
||||||
'day=',
|
|
||||||
'name=',
|
|
||||||
'p='
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$match = str_replace('/', '/?', $permalink_structure);
|
|
||||||
$match = preg_replace('|/[?]|', '', $match, 1);
|
|
||||||
|
|
||||||
$match = str_replace($rewritecode, $rewritereplace, $match);
|
|
||||||
$match = preg_replace('|[?]|', '', $match, 1);
|
|
||||||
|
|
||||||
$feedmatch = str_replace('?/?', '/', $match);
|
|
||||||
$trackbackmatch = $feedmatch;
|
|
||||||
|
|
||||||
preg_match_all('/%.+?%/', $permalink_structure, $tokens);
|
|
||||||
|
|
||||||
$query = 'index.php?';
|
|
||||||
$feedquery = 'wp-feed.php?';
|
|
||||||
$trackbackquery = 'wp-trackback.php?';
|
|
||||||
for ($i = 0; $i < count($tokens[0]); ++$i) {
|
|
||||||
if (0 < $i) {
|
|
||||||
$query .= '&';
|
|
||||||
$feedquery .= '&';
|
|
||||||
$trackbackquery .= '&';
|
|
||||||
}
|
|
||||||
|
|
||||||
$query_token = str_replace($rewritecode, $queryreplace, $tokens[0][$i]) . '$'. ($i + 1);
|
|
||||||
$query .= $query_token;
|
|
||||||
$feedquery .= $query_token;
|
|
||||||
$trackbackquery .= $query_token;
|
|
||||||
}
|
|
||||||
++$i;
|
|
||||||
|
|
||||||
// Add post paged stuff
|
|
||||||
$match .= '([0-9]+)?/?';
|
|
||||||
$query .= "&page=$$i";
|
|
||||||
|
|
||||||
// Add post feed stuff
|
|
||||||
$feedregex = '(feed|rdf|rss|rss2|atom)/?';
|
|
||||||
$feedmatch .= $feedregex;
|
|
||||||
$feedquery .= "&feed=$$i";
|
|
||||||
|
|
||||||
// Add post trackback stuff
|
|
||||||
$trackbackregex = 'trackback/?';
|
|
||||||
$trackbackmatch .= $trackbackregex;
|
|
||||||
|
|
||||||
// Site feed
|
|
||||||
$sitefeedmatch = 'feed/?([0-9a-z-_]+)?/?$';
|
|
||||||
$sitefeedquery = $site_root . 'wp-feed.php?feed=$1';
|
|
||||||
|
|
||||||
// Site comment feed
|
|
||||||
$sitecommentfeedmatch = 'comments/feed/?([0-9a-z-_]+)?/?$';
|
|
||||||
$sitecommentfeedquery = $site_root . 'wp-feed.php?feed=$1&withcomments=1';
|
|
||||||
|
|
||||||
// Code for nice categories, currently not very flexible
|
|
||||||
$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
|
|
||||||
$catmatch = $front . 'category/';
|
|
||||||
$catmatch = preg_replace('|^/+|', '', $catmatch);
|
|
||||||
$authormatch = $front . 'author/';
|
|
||||||
$authormatch = preg_replace('|^/+|', '', $authormatch);
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<form action"">
|
<form action"">
|
||||||
<textarea rows="5" style="width: 100%;">RewriteEngine On
|
<textarea rows="5" style="width: 100%;">RewriteEngine On
|
||||||
RewriteBase <?php echo $site_root; ?>
|
RewriteBase <?php echo $site_root; ?>
|
||||||
RewriteRule ^<?php echo $match; echo '$ ' . $site_root . $query ?> [QSA]
|
<?php
|
||||||
RewriteRule ^<?php echo $feedmatch; echo '$ ' . $site_root . $feedquery ?> [QSA]
|
$rewrite = rewrite_rules();
|
||||||
RewriteRule ^<?php echo $trackbackmatch; echo '$ ' . $site_root . $trackbackquery ?> [QSA]
|
foreach ($rewrite as $match => $query) {
|
||||||
RewriteRule ^<?php echo $catmatch; ?>(.*)/<?php echo $feedregex ?>$ <?php echo $site_root; ?>wp-feed.php?category_name=$1&feed=$2 [QSA]
|
echo 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA]\n";
|
||||||
RewriteRule ^<?php echo $catmatch; ?>?(.*) <?php echo $site_root; ?>index.php?category_name=$1 [QSA]
|
}
|
||||||
RewriteRule ^<?php echo $authormatch; ?>(.*)/<?php echo $feedregex ?>$ <?php echo $site_root; ?>wp-feed.php?author_name=$1&feed=$2 [QSA]
|
?></textarea>
|
||||||
RewriteRule ^<?php echo $authormatch; ?>?(.*) <?php echo $site_root; ?>index.php?author_name=$1 [QSA]
|
|
||||||
RewriteRule ^<?php echo $sitefeedmatch; ?> <?php echo $sitefeedquery ?> [QSA]
|
|
||||||
RewriteRule ^<?php echo $sitecommentfeedmatch; ?> <?php echo $sitecommentfeedquery ?> [QSA]</textarea>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
|
|
@ -1401,7 +1401,7 @@ function rewrite_rules($matches = '') {
|
||||||
'([0-9]{4})?',
|
'([0-9]{4})?',
|
||||||
'([0-9]{1,2})?',
|
'([0-9]{1,2})?',
|
||||||
'([0-9]{1,2})?',
|
'([0-9]{1,2})?',
|
||||||
'([0-9a-z-]+)?',
|
'([0-9a-z_-]+)?',
|
||||||
'([0-9]+)?'
|
'([0-9]+)?'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -1443,24 +1443,24 @@ function rewrite_rules($matches = '') {
|
||||||
++$i;
|
++$i;
|
||||||
|
|
||||||
// Add post paged stuff
|
// Add post paged stuff
|
||||||
$match .= '([0-9]+)?/?';
|
$match .= '([0-9]+)?/?$';
|
||||||
$query .= '&page=' . preg_index($i, $matches);
|
$query .= '&page=' . preg_index($i, $matches);
|
||||||
|
|
||||||
// Add post feed stuff
|
// Add post feed stuff
|
||||||
$feedregex = '(feed|rdf|rss|rss2|atom)/?';
|
$feedregex = '(feed|rdf|rss|rss2|atom)/?$';
|
||||||
$feedmatch .= $feedregex;
|
$feedmatch .= $feedregex;
|
||||||
$feedquery .= '&feed=' . preg_index($i, $matches);
|
$feedquery .= '&feed=' . preg_index($i, $matches);
|
||||||
|
|
||||||
// Add post trackback stuff
|
// Add post trackback stuff
|
||||||
$trackbackregex = 'trackback/?';
|
$trackbackregex = 'trackback/?$';
|
||||||
$trackbackmatch .= $trackbackregex;
|
$trackbackmatch .= $trackbackregex;
|
||||||
|
|
||||||
// Site feed
|
// Site feed
|
||||||
$sitefeedmatch = 'feed/?([0-9a-z-]+)?/?$';
|
$sitefeedmatch = 'feed/?([0-9a-z_-]+)?/?$';
|
||||||
$sitefeedquery = $site_root . 'wp-feed.php?feed=' . preg_index(1, $matches);
|
$sitefeedquery = $site_root . 'wp-feed.php?feed=' . preg_index(1, $matches);
|
||||||
|
|
||||||
// Site comment feed
|
// Site comment feed
|
||||||
$sitecommentfeedmatch = 'comments/feed/?([0-9a-z-]+)?/?$';
|
$sitecommentfeedmatch = 'comments/feed/?([0-9a-z_-]+)?/?$';
|
||||||
$sitecommentfeedquery = $site_root . 'wp-feed.php?feed=' . preg_index(1, $matches) . '&withcomments=1';
|
$sitecommentfeedquery = $site_root . 'wp-feed.php?feed=' . preg_index(1, $matches) . '&withcomments=1';
|
||||||
|
|
||||||
// Code for nice categories and authors, currently not very flexible
|
// Code for nice categories and authors, currently not very flexible
|
||||||
|
@ -1490,7 +1490,7 @@ function rewrite_rules($matches = '') {
|
||||||
$authormatch => $authorquery,
|
$authormatch => $authorquery,
|
||||||
$match => $query,
|
$match => $query,
|
||||||
$feedmatch => $feedquery,
|
$feedmatch => $feedquery,
|
||||||
$trackbackmatch => $tracbackquery,
|
$trackbackmatch => $trackbackquery,
|
||||||
$sitefeedmatch => $sitefeedquery,
|
$sitefeedmatch => $sitefeedquery,
|
||||||
$sitecommentfeedmatch => $sitecommentfeedquery
|
$sitecommentfeedmatch => $sitecommentfeedquery
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue