Changeset 17052

Timestamp:

12/19/2010 04:55:46 AM (14 years ago)

Author:

dd32

Message:

Fix Pings/Trackback comment table filter. Props greuben. Fixes #15885

File:

• trunk/wp-includes/comment.php (modified) (5 diffs)

trunk/wp-includes/comment.php

@@ -306 +306 @@
         if ( '' !== $karma )
             $where .= $wpdb->prepare( ' AND comment_karma = %d', $karma );
-        if ( 'comment' == $type )
+        if ( 'comment' == $type ) {
             $where .= " AND comment_type = ''";
-        elseif ( ! empty( $type ) )
+        } elseif( 'pings' == $type ) {
+            $where .= ' AND comment_type IN ("pingback", "trackback")';
+        } elseif ( ! empty( $type ) ) {
             $where .= $wpdb->prepare( ' AND comment_type = %s', $type );
+        }
         if ( '' !== $parent )
             $where .= $wpdb->prepare( ' AND comment_parent = %d', $parent );
@@ -1760 +1763 @@
 
     $pung = get_pung($post_ID);
-
+var_Dump(compact('pung'));
     // Variables
     $ltrs = '\w';
@@ -1783 +1786 @@
 
     foreach ( (array) $post_links_temp[0] 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) && !in_array($link_test, $post_links) && (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) ) {
@@ -1793 +1796 @@
         endif;
     endforeach;
-
+var_dump(compact('post_links', 'post_links_temp'));
     do_action_ref_array('pre_ping', array(&$post_links, &$pung));
 
     foreach ( (array) $post_links as $pagelinkedto ) {
         $pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
+        var_dump(compact('pagelinkedto', 'pingback_server_url'));
 
         if ( $pingback_server_url ) {
@@ -1806 +1810 @@
             // using a timeout of 3 seconds should be enough to cover slow servers
             $client = new WP_HTTP_IXR_Client($pingback_server_url);
-            $client->timeout = 3;
+            $client->timeout = 5;
             $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
             // when set to true, this outputs debug messages by itself
-            $client->debug = false;
+            $client->debug = true;
 
             if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
                 add_ping( $post_ID, $pagelinkedto );
+            var_Dump($client);
+            echo '<hr />';
         }
     }