Ticket #38202: 38202.2.diff

src/wp-includes/comment.php

@@ -2308 +2308 @@
  * Perform trackbacks.
  *
  * @since 1.5.0
+ * @since 4.7.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $post_id Post ID to do trackbacks on.
+ * @param int|WP_Post $post Post Object or ID to do trackbacks on.
  */
-function do_trackbacks($post_id) {
+function do_trackbacks( $post ) {
         global $wpdb;
+        $post = get_post( $post );
+        if ( ! $post ) {
+                return false;
+        }
 
-        $post = get_post( $post_id );
-        $to_ping = get_to_ping($post_id);
-        $pinged  = get_pung($post_id);
+        $to_ping = get_to_ping( $post );
+        $pinged  = get_pung( $post );
         if ( empty($to_ping) ) {
-                $wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );
+                $wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post->ID) );
                 return;
         }
 
@@ -2343 +2347 @@
                 foreach ( (array) $to_ping as $tb_ping ) {
                         $tb_ping = trim($tb_ping);
                         if ( !in_array($tb_ping, $pinged) ) {
-                                trackback($tb_ping, $post_title, $excerpt, $post_id);
+                                trackback($tb_ping, $post_title, $excerpt, $post->ID);
                                 $pinged[] = $tb_ping;
                         } else {
-                                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
+                                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
+                                        '')) WHERE ID = %d", $tb_ping, $post->ID) );
                         }
                 }
         }
@@ -2378 +2383 @@
  *
  * @since 0.71
  *
- * @param string $content Post content to check for links.
- * @param int $post_ID Post ID.
+ * @param string $content Post content to check for links. If empty will retrieve from post.
+ * @param int|WP_Post $post Post Object or ID.
  */
-function pingback($content, $post_ID) {
+function pingback($content, $post) {
         include_once( ABSPATH . WPINC . '/class-IXR.php' );
         include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );
 
         // original code by Mort (http://mort.mine.nu:8080)
         $post_links = array();
 
-        $pung = get_pung($post_ID);
+        $post = get_post( $post );
+        if ( ! $post ) {
+                return false;
+        }
+
+        $pung = get_pung( $post );
+
+        if ( empty( $content ) ) {
+                $content = $post->post_content;
+        }
 
         // Step 1
         // Parsing the post, external links (if any) are stored in the $post_links array
@@ -2404 +2418 @@
         // We don't wanna ping first and second types, even if they have a valid <link/>
 
         foreach ( (array) $post_links_temp as $link_test ) :
-                if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
+                if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post->ID) // If we haven't pung it already and it isn't a link to itself
                                 && !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
                         if ( $test = @parse_url($link_test) ) {
                                 if ( isset($test['query']) )
@@ -2425 +2439 @@
          * @param array &$pung       Whether a link has already been pinged, passed by reference.
          * @param int   $post_ID     The post ID.
          */
-        do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post_ID ) );
+        do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post->ID ) );
 
         foreach ( (array) $post_links as $pagelinkedto ) {
                 $pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
@@ -2433 +2447 @@
                 if ( $pingback_server_url ) {
                         @ set_time_limit( 60 );
                         // Now, the RPC call
-                        $pagelinkedfrom = get_permalink($post_ID);
+                        $pagelinkedfrom = get_permalink( $post );
 
                         // using a timeout of 3 seconds should be enough to cover slow servers
                         $client = new WP_HTTP_IXR_Client($pingback_server_url);
@@ -2455 +2469 @@
                         $client->debug = false;
 
                         if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
-                                add_ping( $post_ID, $pagelinkedto );
+                                add_ping( $post, $pagelinkedto );
                 }
         }
 }

src/wp-includes/post.php

@@ -3909 +3909 @@
  *
  * @since 1.5.0
  *
+ * @since 4.7.0 Support Post Object and Allow for Array
+ *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int    $post_id Post ID.
- * @param string $uri     Ping URI.
+ * @param int|WP_Post    $post Post Object or ID.
+ * @param string|array $uri     Ping URI or array of URIs.
  * @return int|false How many rows were updated.
  */
-function add_ping( $post_id, $uri ) {
+function add_ping( $post, $uri ) {
         global $wpdb;
-        $pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id ));
-        $pung = trim($pung);
+        
+        $post = get_post( $post );
+        if ( ! $post ) {
+                return false;
+        }
+
+        $pung = trim($post->pinged);
         $pung = preg_split('/\s/', $pung);
-        $pung[] = $uri;
+        if ( is_array( $uri ) ) {
+                $pung = array_merge( $pung, $uri );
+        }
+        else {
+                $pung[] = $uri;
+        }
         $new = implode("\n", $pung);
 
         /**
@@ -3932 +3944 @@
          */
         $new = apply_filters( 'add_ping', $new );
 
-        // expected_slashed ($new).
-        $new = wp_unslash($new);
-        return $wpdb->update( $wpdb->posts, array( 'pinged' => $new ), array( 'ID' => $post_id ) );
+        $return = $wpdb->update( $wpdb->posts, array( 'pinged' => $new ), array( 'ID' => $post->ID ) );
+        clean_post_cache( $post->ID );
+        return $return;
 }
 
 /**
@@ -3976 +3988 @@
  *
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
+ * @since 4.7.0 Accept Post Object
  *
- * @param int $post_id Post ID.
+ * @param int|WP_Post $post Post ID or object.
  * @return array
  */
-function get_pung( $post_id ) {
-        global $wpdb;
-        $pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id ));
-        $pung = trim($pung);
-        $pung = preg_split('/\s/', $pung);
+function get_pung( $post ) {
+        $post = get_post( $post );
+        if ( ! $post ) {
+                return false;
+        }
+        $pung = trim( $post->pinged );
+        $pung = preg_split( '/\s/', $pung );
 
         /**
          * Filters the list of already-pinged URLs for the given post.
@@ -4002 +4016 @@
  *
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
+ * @since 4.7.0 Support Post Object.
  *
- * @param int $post_id Post ID
+ * @param int|WP_Post $post Post Object or ID
  * @return array
  */
-function get_to_ping( $post_id ) {
-        global $wpdb;
-        $to_ping = $wpdb->get_var( $wpdb->prepare( "SELECT to_ping FROM $wpdb->posts WHERE ID = %d", $post_id ));
-        $to_ping = sanitize_trackback_urls( $to_ping );
+function get_to_ping( $post ) {
+        $post = get_post( $post );
+        if ( ! $post ) {
+                return false;
+        }
+
+        $to_ping = sanitize_trackback_urls( $post->to_ping );
         $to_ping = preg_split('/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY);
 
         /**

tests/phpunit/tests/post/pings.php

@@ -5 +5 @@
  * @group pings
  */
 class Tests_Ping_and_Trackback_Sending extends WP_UnitTestCase {
-        public function test_returns_pinged_sites() {
-                $post_id = self::factory()->post->create( array( 'pinged' => 'foo\nbar\nbaz' ) );
+        public function test_returns_to_ping_sites_from_post_id() {
+                $post_id = self::factory()->post->create( array( 'to_ping' => 'http://www.example.com
+                                        http://www.otherexample.com' ) );
+                $this->assertEqualSets( array( 'http://www.example.com', 'http://www.otherexample.com' ), get_to_ping( $post_id ) );
+        }
+        public function test_returns_to_ping_sites_from_post_object() { 
+                $post_id = self::factory()->post->create( array( 'to_ping' => 'http://www.example.com
+                                        http://www.otherexample.com' ) );
+                $post = get_post( $post_id );
+                $this->assertEqualSets( array( 'http://www.example.com', 'http://www.otherexample.com' ), get_to_ping( $post ) );
+        }
+
+        public function test_returns_pinged_sites_from_post_id() {
+                $post_id = self::factory()->post->create( array( 'pinged' => 'foo bar baz' ) );
+                $this->assertEqualSets( array( 'foo', 'bar', 'baz' ), get_pung( $post_id ) );
+        }
+        public function test_returns_pinged_sites_from_post_object() {
+                $post_id = self::factory()->post->create( array( 'pinged' => 'foo bar baz' ) );
+                $post = get_post( $post_id );
+                $this->assertEqualSets( array( 'foo', 'bar', 'baz' ), get_pung( $post ) );
+        }
+        public function test_add_ping_with_post_id() {
+                $post_id = self::factory()->post->create();
+                add_ping( $post_id, 'foo' );
+                add_ping( $post_id, 'bar' );
+                add_ping( $post_id, 'baz' );
+                $this->assertEqualSets( array( 'foo', 'bar', 'baz' ), get_pung( $post_id ) );
+        }
+
+        public function test_add_ping_array_with_post_id() {
+                $post_id = self::factory()->post->create();
+                add_ping( $post_id, array( 'foo', 'bar', 'baz' ) );
                 $this->assertEqualSets( array( 'foo', 'bar', 'baz' ), get_pung( $post_id ) );
         }
+
+  public function test_add_ping_with_post_object() {
+                $post_id = self::factory()->post->create();
+                $post = get_post( $post_id );
+                add_ping( $post, 'foo' );
+                $this->assertEqualSets( array( 'foo' ), get_pung( $post_id ) );
+        }
+
+
+
 }