Changes from branches/3.5/wp-includes/class-wp-xmlrpc-server.php at r23330 to trunk/wp-includes/class-wp-xmlrpc-server.php at r22914

File:

• trunk/wp-includes/class-wp-xmlrpc-server.php (modified) (10 diffs)

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -5310 +5310 @@
         $pagelinkedto = str_replace('&', '&', $pagelinkedto);
 
-        $pagelinkedfrom = apply_filters( 'pingback_ping_source_uri', $pagelinkedfrom, $pagelinkedto );
-        if ( ! $pagelinkedfrom )
-            return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );
-
         // Check if the page linked to is in our site
         $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
         if ( !$pos1 )
-            return $this->pingback_error( 0, __( 'Is there no link to us?' ) );
+            return new IXR_Error(0, __('Is there no link to us?'));
 
         // let's find which post is linked to
@@ -5351 +5347 @@
                 if (! ($post_ID = $wpdb->get_var($sql)) ) {
                     // returning unknown error '0' is better than die()ing
-                    return $this->pingback_error( 0, '' );
+                    return new IXR_Error(0, '');
                 }
                 $way = 'from the fragment (title)';
@@ -5357 +5353 @@
         } else {
             // TODO: Attempt to extract a post ID from the given URL
-            return $this->pingback_error( 33, __('The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.'));
         }
         $post_ID = (int) $post_ID;
@@ -5364 +5360 @@
 
         if ( !$post ) // Post_ID not found
-            return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.'));
 
         if ( $post_ID == url_to_postid($pagelinkedfrom) )
-            return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
+            return new IXR_Error(0, __('The source URL and the target URL cannot both point to the same resource.'));
 
         // Check if pings are on
         if ( !pings_open($post) )
-            return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.'));
 
         // Let's check that the remote site didn't already pingback this entry
         if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
-            return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
+            return new IXR_Error( 48, __( 'The pingback has already been registered.' ) );
 
         // very stupid, but gives time to the 'from' server to publish !
@@ -5381 +5377 @@
 
         // Let's check the remote site
-        $linea = wp_remote_retrieve_body( wp_remote_get( $pagelinkedfrom, array( 'timeout' => 10, 'redirection' => 0 ) ) );
+        $linea = wp_remote_fopen( $pagelinkedfrom );
         if ( !$linea )
-            return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
+            return new IXR_Error(16, __('The source URL does not exist.'));
 
         $linea = apply_filters('pre_remote_source', $linea, $pagelinkedto);
@@ -5395 +5391 @@
         $title = $matchtitle[1];
         if ( empty( $title ) )
-            return $this->pingback_error( 32, __('We cannot find a title on that page.' ) );
+            return new IXR_Error(32, __('We cannot find a title on that page.'));
 
         $linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
@@ -5431 +5427 @@
 
         if ( empty($context) ) // Link to target not found
-            return $this->pingback_error( 17, __( 'The source URL does not contain a link to the target URL, and so cannot be used as a source.' ) );
+            return new IXR_Error(17, __('The source URL does not contain a link to the target URL, and so cannot be used as a source.'));
 
         $pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
@@ -5478 +5474 @@
         if ( !$post_ID ) {
             // We aren't sure that the resource is available and/or pingback enabled
-            return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.'));
         }
 
@@ -5485 +5481 @@
         if ( !$actual_post ) {
             // No such post = resource not found
-            return $this->pingback_error( 32, __('The specified target URL does not exist.' ) );
+            return new IXR_Error(32, __('The specified target URL does not exist.'));
         }
 
@@ -5501 +5497 @@
         return $pingbacks;
     }
-
-    protected function pingback_error( $code, $message ) {
-        return apply_filters( 'xmlrpc_pingback_error', new IXR_Error( $code, $message ) );
-    }
 }