Wordpress 2.3.3-scripts

[autoinstalls/wordpress.git] / wp-trackback.php

diff --git a/wp-trackback.php b/wp-trackback.php
index ae6ed41192c486242d9fbac7277824ff029367eb..4d82f9fc9c43da8b7654265f578b1a3354e75163 100644 (file)
--- a/wp-trackback.php
+++ b/wp-trackback.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($wp)) {
-       require_once('wp-config.php');
+       require_once('./wp-config.php');
        wp('tb=1');
 }
 
@@ -54,8 +54,8 @@ $title     = $wpdb->escape($title);
 $excerpt   = $wpdb->escape($excerpt);
 $blog_name = $wpdb->escape($blog_name);
 
-if ( is_single() || is_page() ) 
-    $tb_id = $posts[0]->ID;
+if ( is_single() || is_page() )
+       $tb_id = $posts[0]->ID;
 
 if ( !intval( $tb_id ) )
        trackback_response(1, 'I really need an ID for this to work.');
@@ -66,7 +66,7 @@ if (empty($title) && empty($tb_url) && empty($blog_name)) {
        exit;
 }
 
-if ( !empty($tb_url) && !empty($title) && !empty($tb_url) ) {
+if ( !empty($tb_url) && !empty($title) ) {
        header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
 
        $pingstatus = $wpdb->get_var("SELECT ping_status FROM $wpdb->posts WHERE ID = $tb_id");
@@ -77,8 +77,8 @@ if ( !empty($tb_url) && !empty($title) && !empty($tb_url) ) {
        $title =  wp_specialchars( strip_tags( $title ) );
        $excerpt = strip_tags($excerpt);
        if ( function_exists('mb_strcut') ) { // For international trackbacks
-               $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...';
-               $title = mb_strcut($title, 0, 250, get_settings('blog_charset')) . '...';
+               $excerpt = mb_strcut($excerpt, 0, 252, get_option('blog_charset')) . '...';
+               $title = mb_strcut($title, 0, 250, get_option('blog_charset')) . '...';
        } else {
                $excerpt = (strlen($excerpt) > 255) ? substr($excerpt, 0, 252) . '...' : $excerpt;
                $title = (strlen($title) > 250) ? substr($title, 0, 250) . '...' : $title;
@@ -93,7 +93,7 @@ if ( !empty($tb_url) && !empty($title) && !empty($tb_url) ) {
 
        $dupe = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_author_url = '$comment_author_url'");
        if ( $dupe )
-               trackback_response(1, 'We already have a ping from that URI for this post.');
+               trackback_response(1, 'We already have a ping from that URL for this post.');
 
        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');