Changeset 1376

Timestamp:

05/31/2004 11:35:32 PM (21 years ago)

Author:

rboren

Message:

index.php now handles feeds and trackbacks.

Location:

trunk

Files:

• wp-blog-header.php (modified) (2 diffs)
• wp-feed.php (modified) (1 diff)
• wp-includes/functions.php (modified) (4 diffs)
• wp-trackback.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -69 +69 @@
     }
 
+if ($feed != '') {
+    $doing_rss = 1;
+}
+
+if ($tb == 1) {
+    $doing_trackback = 1;
+}
 
 // Sending HTTP headers
@@ -161 +168 @@
 }
 
+if ($pagenow != 'wp-feed.php' && $feed != '') {
+    require(dirname(__FILE__) . '/wp-feed.php');
+    exit;
+}
+
+if ($pagenow != 'wp-trackback.php' && $tb == 1) {
+    require(dirname(__FILE__) . '/wp-trackback.php');
+    exit;
+}
+
 if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
     if ($use_gzipcompression) {

trunk/wp-feed.php

@@ -1 +1 @@
 <?php
 
-$blog = 1;
-$doing_rss = 1;
-require('wp-blog-header.php');
+if (! $doing_rss) {
+    $doing_rss = 1;
+    require('wp-blog-header.php');
+}
+
+// Remove the pad, if present.
+$feed = preg_replace('/^_+/', '', $feed);
 
 if ($feed == '' || $feed == 'feed') {

trunk/wp-includes/functions.php

@@ -1228 +1228 @@
 
     $index = 'index.php';
-    $feedindex = 'wp-feed.php';
-    $trackbackindex = 'wp-trackback.php';
+    $feedindex = 'index.php';
+    $trackbackindex = 'index.php';
     for ($i = 0; $i < $num_tokens; ++$i) {
              if (0 < $i) {
@@ -1264 +1264 @@
                 $post = 1;
                 $trackbackmatch = $match . $trackbackregex;
-                $trackbackquery = $trackbackindex . '?' . $query;
+                $trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
                 $match = $match . '?([0-9]+)?/?$';
                 $query = $index . '?' . $query . '&page=' . preg_index($num_toks + 1, $matches);
@@ -1316 +1316 @@
     // Site feed
     $sitefeedmatch = 'feed/?([_0-9a-z-]+)?/?$';
-    $sitefeedquery = 'wp-feed.php?feed=' . preg_index(1, $matches);
+    $sitefeedquery = 'index.php?feed=_' . preg_index(1, $matches);
 
     // Site comment feed
     $sitecommentfeedmatch = 'comments/feed/?([_0-9a-z-]+)?/?$';
-    $sitecommentfeedquery = 'wp-feed.php?feed=' . preg_index(1, $matches) . '&withcomments=1';
+    $sitecommentfeedquery = 'index.php?feed=_' . preg_index(1, $matches) . '&withcomments=1';
 
     // Site page
@@ -1344 +1344 @@
     $author_structure = $front . 'author/%author%';
     $author_rewrite = generate_rewrite_rules($author_structure);
-
 
     // Put them together.

trunk/wp-trackback.php

@@ -11 +11 @@
 $blog_name = $_POST['blog_name'];
 
-require('wp-blog-header.php');
+if (! $doing_trackback) {
+    $doing_trackback = 1;
+    require('wp-blog-header.php');
+}
 
 if ( (($p != '') && ($p != 'all')) || ($name != '') ) {