Changeset 38852

Timestamp:

10/21/2016 05:59:34 AM (8 years ago)

Author:

pento

Message:

Pings: Allow ping functions to accept WP_Post objects as well as post IDs.

This removes the use of several global $wpdb instances, as well as bringing the ping functions into line with other post-related functions, which will accept a post ID or WP_Post object.

Props dshanke.
Fixes #38202.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (8 diffs)
• src/wp-includes/post.php (modified) (4 diffs)
• tests/phpunit/tests/post/pings.php (added)

trunk/src/wp-includes/comment.php

@@ -2406 +2406 @@
  *
  * @since 1.5.0
+ * @since 4.7.0 $post_id can be a WP_Post object.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $post_id Post ID to do trackbacks on.
- */
-function do_trackbacks($post_id) {
+ * @param int|WP_Post $post_id Post object or ID to do trackbacks on.
+ */
+function do_trackbacks( $post_id ) {
     global $wpdb;
-
     $post = get_post( $post_id );
-    $to_ping = get_to_ping($post_id);
-    $pinged  = get_pung($post_id);
-    if ( empty($to_ping) ) {
-        $wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );
+    if ( ! $post ) {
+        return false;
+    }
+
+    $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 ) );
         return;
     }
@@ -2441 +2445 @@
             $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 ) );
             }
         }
@@ -2475 +2480 @@
  *
  * @since 0.71
- *
- * @param string $content Post content to check for links.
- * @param int $post_ID Post ID.
- */
-function pingback($content, $post_ID) {
+ * @since 4.7.0 $post_id can be a WP_Post object.
+ *
+ * @param string $content Post content to check for links. If empty will retrieve from post.
+ * @param int|WP_Post $post_id Post Object or ID.
+ */
+function pingback( $content, $post_id ) {
     include_once( ABSPATH . WPINC . '/class-IXR.php' );
     include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );
@@ -2486 +2492 @@
     $post_links = array();
 
-    $pung = get_pung($post_ID);
+    $post = get_post( $post_id );
+    if ( ! $post ) {
+        return;
+    }
+
+    $pung = get_pung( $post );
+
+    if ( empty( $content ) ) {
+        $content = $post->post_content;
+    }
 
     // Step 1
@@ -2502 +2517 @@
 
     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) ) {
@@ -2523 +2538 @@
      * @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 ) {
@@ -2531 +2546 @@
             @ 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
@@ -2553 +2568 @@
 
             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 );
         }
     }

trunk/src/wp-includes/post.php

@@ -3992 +3992 @@
  *
  * @since 1.5.0
+ * @since 4.7.0 $post_id can be a WP_Post object.
+ * @since 4.7.0 $uri can be an array of URIs.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int    $post_id Post ID.
- * @param string $uri     Ping URI.
+ * @param int|WP_Post  $post_id 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 ) {
     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);
-    $pung[] = $uri;
+
+    $post = get_post( $post_id );
+    if ( ! $post ) {
+        return false;
+    }
+
+    $pung = trim( $post->pinged );
+    $pung = preg_split( '/\s/', $pung );
+
+    if ( is_array( $uri ) ) {
+        $pung = array_merge( $pung, $uri );
+    }
+    else {
+        $pung[] = $uri;
+    }
     $new = implode("\n", $pung);
 
@@ -4016 +4029 @@
     $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;
 }
 
@@ -4060 +4073 @@
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param int $post_id Post ID.
+ * @since 4.7.0 $post_id can be a WP_Post object.
+ *
+ * @param int|WP_Post $post_id 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);
+    $post = get_post( $post_id );
+    if ( ! $post ) {
+        return false;
+    }
+
+    $pung = trim( $post->pinged );
+    $pung = preg_split( '/\s/', $pung );
 
     /**
@@ -4085 +4101 @@
  *
  * @since 1.5.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param int $post_id Post ID
+ * @since 4.7.0 $post_id can be a WP_Post object.
+ *
+ * @param int|WP_Post $post_id 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 );
+    $post = get_post( $post_id );
+
+    if ( ! $post ) {
+        return false;
+    }
+
+    $to_ping = sanitize_trackback_urls( $post->to_ping );
     $to_ping = preg_split('/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY);