WordPress 3.5.1-scripts

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

diff --git a/wp-trackback.php b/wp-trackback.php
index 58886f8dc574c6924766edbc239498d6a6eb56bf..06e47507be221d742765f0463ce7f3fc9cd9f945 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 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 = '') {


@@ -36,21 +36,21 @@ function trackback_response($error = 0, $error_message = '') {
 // trackback is done by a POST
 $request_array = 'HTTP_POST_VARS';
 
 // trackback is done by a POST
 $request_array = 'HTTP_POST_VARS';
 

-if ( !$_GET['tb_id'] ) {
+if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) {

        $tb_id = explode('/', $_SERVER['REQUEST_URI']);
        $tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
 }
 
        $tb_id = explode('/', $_SERVER['REQUEST_URI']);
        $tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
 }
 

-$tb_url  = $_POST['url'];
-$charset = $_POST['charset'];
+$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()
 
 // These three are stripslashed here so that they can be properly escaped after mb_convert_encoding()

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

 
 if ($charset)
 
 if ($charset)

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

 else
        $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
 
 else
        $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
 


@@ -72,7 +72,7 @@ $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 ) )
+if ( !isset($tb_id) || !intval( $tb_id ) )

        trackback_response(1, 'I really need an ID for this to work.');
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
        trackback_response(1, 'I really need an ID for this to work.');
 
 if (empty($title) && empty($tb_url) && empty($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