Changeset 36661

Timestamp:

02/24/2016 12:55:01 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Comments: In wp_xmlrpc_server::pingback_ping():

• Rename $linea to $remote_source for clarity.
• Add remote_source to comment data, so it's available to preprocess_comment and comment_post filters.
• Pass the original (unfiltered) response source to the filters too (as remote_source_original in comment data).

Props dshanske for the original patch.
Fixes #34141.

File:

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

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

@@ -6278 +6278 @@
             ),
         );
+
         $request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
-        $linea = wp_remote_retrieve_body( $request );
-
-        if ( !$linea )
+        $remote_source = $remote_source_original = wp_remote_retrieve_body( $request );
+
+        if ( ! $remote_source ) {
             return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
+        }
 
         /**
@@ -6289 +6291 @@
          * @since 2.5.0
          *
-         * @param string $linea        Response object for the page linked from.
-         * @param string $pagelinkedto URL of the page linked to.
+         * @param string $remote_source Response source for the page linked from.
+         * @param string $pagelinkedto  URL of the page linked to.
          */
-        $linea = apply_filters( 'pre_remote_source', $linea, $pagelinkedto );
+        $remote_source = apply_filters( 'pre_remote_source', $remote_source, $pagelinkedto );
 
         // Work around bug in strip_tags():
-        $linea = str_replace('<!DOC', '<DOC', $linea);
-        $linea = preg_replace( '/[\r\n\t ]+/', ' ', $linea ); // normalize spaces
-        $linea = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $linea );
-
-        preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
+        $remote_source = str_replace( '<!DOC', '<DOC', $remote_source );
+        $remote_source = preg_replace( '/[\r\n\t ]+/', ' ', $remote_source ); // normalize spaces
+        $remote_source = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $remote_source );
+
+        preg_match( '|<title>([^<]*?)</title>|is', $remote_source, $matchtitle );
         $title = $matchtitle[1];
         if ( empty( $title ) )
             return $this->pingback_error( 32, __('We cannot find a title on that page.' ) );
 
-        $linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
-
-        $p = explode( "\n\n", $linea );
+        $remote_source = strip_tags( $remote_source, '<a>' ); // just keep the tag we need
+
+        $p = explode( "\n\n", $remote_source );
 
         $preg_target = preg_quote($pagelinkedto, '|');
@@ -6354 +6356 @@
         $comment_type = 'pingback';
 
-        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_content', 'comment_type');
+        $commentdata = compact(
+            'comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email',
+            'comment_content', 'comment_type', 'remote_source', 'remote_source_original'
+        );
 
         $comment_ID = wp_new_comment($commentdata);