WordPress 3.6.1-scripts

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

diff --git a/wp-trackback.php b/wp-trackback.php
index 864da720c3f777f6070f2db5e867c52b5c93db4a..8b41505f2bbd9b6c96fb1610f347ed7bd0c7bab8 100644 (file)
--- a/wp-trackback.php
+++ b/wp-trackback.php
@@ -7,13 +7,13 @@
 
 if (empty($wp)) {
        require_once('./wp-load.php');
 
 if (empty($wp)) {
        require_once('./wp-load.php');

-       wp('tb=1');
+       wp( array( 'tb' => '1' ) );

 }
 
 /**
 }
 
 /**

- * trackback_response() - Respond with error or success XML message
+ * trackback_response() - Respond with an error or success XML message

  *
  *

- * @param int|bool $error Whether there was an error or not
+ * @param int|bool $error Whether there was an error

  * @param string $error_message Error message if an error occurred
  */
 function trackback_response($error = 0, $error_message = '') {
  * @param string $error_message Error message if an error occurred
  */
 function trackback_response($error = 0, $error_message = '') {


@@ -45,9 +45,9 @@ $tb_url  = isset($_POST['url'])     ? $_POST['url']     : '';
 $charset = isset($_POST['charset']) ? $_POST['charset'] : '';
 
 // These three are stripslashed here so that they can be properly escaped after mb_convert_encoding()
 $charset = isset($_POST['charset']) ? $_POST['charset'] : '';
 
 // These three are stripslashed here so that they can be properly escaped after mb_convert_encoding()

-$title     = isset($_POST['title'])     ? stripslashes($_POST['title'])      : '';
-$excerpt   = isset($_POST['excerpt'])   ? stripslashes($_POST['excerpt'])    : '';
-$blog_name = isset($_POST['blog_name']) ? stripslashes($_POST['blog_name'])  : '';
+$title     = isset($_POST['title'])     ? wp_unslash($_POST['title'])      : '';
+$excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
+$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';

 
 if ($charset)
        $charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
 
 if ($charset)
        $charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );


@@ -65,9 +65,9 @@ if ( function_exists('mb_convert_encoding') ) { // For international trackbacks
 }
 
 // Now that mb_convert_encoding() has been given a swing, we need to escape these three
 }
 
 // Now that mb_convert_encoding() has been given a swing, we need to escape these three

-$title     = $wpdb->escape($title);
-$excerpt   = $wpdb->escape($excerpt);
-$blog_name = $wpdb->escape($blog_name);
+$title     = wp_slash($title);
+$excerpt   = wp_slash($excerpt);
+$blog_name = wp_slash($blog_name);

 
 if ( is_single() || is_page() )
        $tb_id = $posts[0]->ID;
 
 if ( is_single() || is_page() )
        $tb_id = $posts[0]->ID;


@@ -87,8 +87,8 @@ if ( !empty($tb_url) && !empty($title) ) {
        if ( !pings_open($tb_id) )
                trackback_response(1, 'Sorry, trackbacks are closed for this item.');
 
        if ( !pings_open($tb_id) )
                trackback_response(1, 'Sorry, trackbacks are closed for this item.');
 

-       $title =  wp_html_excerpt( $title, 250 ).'...';
-       $excerpt = wp_html_excerpt( $excerpt, 252 ).'...';
+       $title =  wp_html_excerpt( $title, 250, '…' );
+       $excerpt = wp_html_excerpt( $excerpt, 252, '…' );

 
        $comment_post_ID = (int) $tb_id;
        $comment_author = $blog_name;
 
        $comment_post_ID = (int) $tb_id;
        $comment_author = $blog_name;


@@ -108,4 +108,3 @@ if ( !empty($tb_url) && !empty($title) ) {
        do_action('trackback_post', $wpdb->insert_id);
        trackback_response(0);
 }
        do_action('trackback_post', $wpdb->insert_id);
        trackback_response(0);
 }

-?>
\ No newline at end of file