WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trackback fix ups. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1696 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rboren 2004-09-18 22:47:43 +00:00
parent 76d4882921
commit 75d974639b
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-feed.php
View File

@ -13,7 +13,7 @@ if ($feed == '' || $feed == 'feed') {
$feed = 'rss2'; $feed = 'rss2';
} }
if ( (($p != '') && ($p != 'all')) || ($name != '') || ($withcomments == 1) ) { if ( is_single() || ($withcomments == 1) ) {
require('wp-commentsrss2.php'); require('wp-commentsrss2.php');
} else { } else {
switch ($feed) { switch ($feed) {

3
wp-includes/functions.php
View File

@ -1222,8 +1222,7 @@ 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 =top $post_rewrite = array($trackbackmatch => $trackbackquery) + $post_rewrite;
> $trackbackquery) + $post_rewrite;
} }
} }

13
wp-trackback.php
View File

@ -1,6 +1,10 @@
<?php <?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'); include_once (ABSPATH . WPINC . '/functions-post.php');
function trackback_response($error = 0, $error_message = '') { function trackback_response($error = 0, $error_message = '') {
@ -31,11 +35,6 @@ $title = $_POST['title'];
$excerpt = $_POST['excerpt']; $excerpt = $_POST['excerpt'];
$blog_name = $_POST['blog_name']; $blog_name = $_POST['blog_name'];
if ( !$doing_trackback) {
$doing_trackback = 1;
require('./wp-blog-header.php');
}
if ( is_single() ) if ( is_single() )
$tb_id = $posts[0]->ID; $tb_id = $posts[0]->ID;