Changeset 836 for trunk/wp-admin/options-permalink.php

Timestamp:

02/05/2004 08:55:50 PM (22 years ago)

Author:

rboren

Message:

Clean feed and trackback URLs.

File:

• trunk/wp-admin/options-permalink.php (modified) (2 diffs)

trunk/wp-admin/options-permalink.php

@@ -130 +130 @@
 $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 .= '&';
-    $query .= str_replace($rewritecode, $queryreplace, $tokens[0][$i]) . '$'. ($i + 1);
+    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
@@ -152 +184 @@
 RewriteBase <?php echo $site_root; ?> 
 RewriteRule ^<?php echo $match; echo '$ ' . $site_root . $query ?> [QSA]
-RewriteRule ^<?php echo $catmatch; ?>?(.*) <?php echo $site_root; ?>index.php?category_name=$1 [QSA]</textarea> 
+RewriteRule ^<?php echo $feedmatch; echo '$ ' . $site_root . $feedquery ?> [QSA]
+RewriteRule ^<?php echo $trackbackmatch; echo '$ ' . $site_root . $trackbackquery ?> [QSA]
+RewriteRule ^<?php echo $catmatch; ?>(.*)/<?php echo $feedregex ?>$ <?php echo $site_root; ?>wp-feed.php?category_name=$1&feed=$2 [QSA]
+RewriteRule ^<?php echo $catmatch; ?>?(.*) <?php echo $site_root; ?>index.php?category_name=$1 [QSA]
+RewriteRule ^<?php echo $sitefeedmatch; ?> <?php echo $sitefeedquery ?> [QSA]
+RewriteRule ^<?php echo $sitecommentfeedmatch; ?> <?php echo $sitecommentfeedquery ?> [QSA]</textarea>
     </form>
 </div>