WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@440 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 1 insertions, 3 deletions

diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index ed9e5ff..1fb41e6 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -812,8 +812,7 @@ function trackback($trackback_url, $title, $excerpt, $ID) {
 
 	$tb_url = addslashes( $tb_url );
 	$wpdb->query("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', '$tb_url') WHERE ID = '$ID'");
-	$wpdb->query("UPDATE $wpdb->posts SET to_ping = REPLACE(to_ping, '$tb_url', '') WHERE ID = '$ID'");
-	return $result;
+	return $wpdb->query("UPDATE $wpdb->posts SET to_ping = REPLACE(to_ping, '$tb_url', '') WHERE ID = '$ID'");
 }
 
 function make_url_footnote($content) {
@@ -2144,7 +2143,6 @@ function register_deactivation_hook($file, $function) {
 
 function plugin_basename($file) {
 	$file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
-	$file = stripslashes($file);
 	return $file;
 }