Ticket #6698: wordpress_generic_ping_ticket_6698.patch

wp-includes/comment.php

@@ -1377 +1377 @@
  * @return int Same as Post ID from parameter
  */
 function generic_ping($post_id = 0) {
+        $last_ping = get_option('generic_ping_last');
+
+        if ( $last_ping === false ) {
+                add_option('generic_ping_last', time());
+        } else {
+                update_option('generic_ping_last', time());
+        }
+
         $services = get_option('ping_sites');
 
         $services = explode("\n", $services);

wp-includes/post.php

@@ -3275 +3275 @@
                         $wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
                 do_action('private_to_published', $post->ID);  // Deprecated, use private_to_publish
                 // do generic pings once per hour at most
-                if ( !wp_next_scheduled('do_generic_ping') )
-                        wp_schedule_single_event(time() + 3600, 'do_generic_ping');
+                if ( !wp_next_scheduled('do_generic_ping') ) {
+                        $last_ping = get_option('generic_ping_last', 0);
+                        wp_schedule_single_event(max(time() + 60, $last_ping + 1800), 'do_generic_ping');
+                }
         }
 
         // Always clears the hook in case the post status bounced from future to draft.