From 75d974639bdb7a7ed689aee5b1a70871df7b59eb Mon Sep 17 00:00:00 2001
From: rboren <rboren@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 18 Sep 2004 22:47:43 +0000
Subject: [PATCH] Trackback fix ups.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1696 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-feed.php               |  2 +-
 wp-includes/functions.php |  3 +--
 wp-trackback.php          | 13 ++++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/wp-feed.php b/wp-feed.php
index 6b4dd6e825..4b662f8abd 100644
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -13,7 +13,7 @@ if ($feed == '' || $feed == 'feed') {
     $feed = 'rss2';
 }
 
-if ( (($p != '') && ($p != 'all')) || ($name != '') || ($withcomments == 1) ) {
+if ( is_single() || ($withcomments == 1) ) {
     require('wp-commentsrss2.php');
 } else {
     switch ($feed) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index a31f15b77d..0fbb6d658d 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1222,8 +1222,7 @@ function generate_rewrite_rules($permalink_structure = '', $matches = '') {
         $post_rewrite = array($feedmatch => $feedquery, $pagematch => $pagequery, $match => $query) + $post_rewrite;
 
         if ($post) {
-            $post_rewrite = array($trackbackmatch =top
-> $trackbackquery) + $post_rewrite;
+            $post_rewrite = array($trackbackmatch => $trackbackquery) + $post_rewrite;
         }
     }
 
diff --git a/wp-trackback.php b/wp-trackback.php
index 5f9d6a38cf..a9f871a80c 100644
--- a/wp-trackback.php
+++ b/wp-trackback.php
@@ -1,6 +1,10 @@
 <?php
-$doing_trackback = 1;
-require('./wp-config.php');
+
+if ( !$doing_trackback) {
+    $doing_trackback = 1;
+    require('wp-blog-header.php');
+}
+
 include_once (ABSPATH . WPINC . '/functions-post.php');
 
 function trackback_response($error = 0, $error_message = '') {
@@ -31,11 +35,6 @@ $title = $_POST['title'];
 $excerpt = $_POST['excerpt'];
 $blog_name = $_POST['blog_name'];
 
-if ( !$doing_trackback) {
-    $doing_trackback = 1;
-    require('./wp-blog-header.php');
-}
-
 if ( is_single() ) 
     $tb_id = $posts[0]->ID;