Changeset 4077

Timestamp:

08/07/2006 03:50:55 AM (20 years ago)

Author:

ryan

Message:

Rework wp_publish_post() to use wp_update_post() again while turning off filters. Clear the cron schedule for a post when the post timestamp is updated. #2715 #2737

Location:

trunk

Files:

• wp-cron.php (modified) (1 diff)
• wp-includes/cron.php (modified) (2 diffs)
• wp-includes/post.php (modified) (6 diffs)

trunk/wp-cron.php

@@ -8 +8 @@
 
 $crons = get_option('cron');
-if (!is_array($crons) || array_shift(array_keys($crons)) > time())
+$keys = array_keys($crons);
+if (!is_array($crons) || $keys[0] > time())
         return;
 foreach ($crons as $timestamp => $cronhooks) {

trunk/wp-includes/cron.php

@@ -51 +51 @@
 
 function wp_clear_scheduled_hook( $hook ) {
-        while ( $timestamp = wp_next_scheduled( $hook ) )
+        $args = array_slice( func_get_args(), 1 );
+        
+        while ( $timestamp = wp_next_scheduled( $hook, $args ) )
                 wp_unschedule_event( $timestamp, $hook );
 }
 
-function wp_next_scheduled( $hook ) {
+function wp_next_scheduled( $hook, $args = '' ) {
         $crons = get_option( 'cron' );
         if ( empty($crons) )
                 return false;
         foreach ( $crons as $timestamp => $cron )
-                if ( isset( $cron[$hook] ) )
-                        return $timestamp;
+                if ( isset( $cron[$hook] ) ) {
+                        if ( empty($args) )
+                                return $timestamp;
+                        if ( $args == $cron[$hook]['args'] )
+                                return $timestamp;
+                }
         return false;
 }
@@ -93 +99 @@
 
         $keys = array_keys( $crons );
-        if ( array_shift( $keys ) > time() )
+        if ( $keys[0] > time() )
                 return;
 

trunk/wp-includes/post.php

@@ -497 +497 @@
 
         // Get the basics.
-        $post_content    = apply_filters('content_save_pre',   $post_content);
-        $post_excerpt    = apply_filters('excerpt_save_pre',   $post_excerpt);
-        $post_title      = apply_filters('title_save_pre',     $post_title);
-        $post_category   = apply_filters('category_save_pre',  $post_category);
-        $post_status     = apply_filters('status_save_pre',    $post_status);
-        $post_name       = apply_filters('name_save_pre',      $post_name);
-        $comment_status  = apply_filters('comment_status_pre', $comment_status);
-        $ping_status     = apply_filters('ping_status_pre',    $ping_status);
+        if ( empty($no_filter) ) {
+                $post_content    = apply_filters('content_save_pre',   $post_content);
+                $post_excerpt    = apply_filters('excerpt_save_pre',   $post_excerpt);
+                $post_title      = apply_filters('title_save_pre',     $post_title);
+                $post_category   = apply_filters('category_save_pre',  $post_category);
+                $post_status     = apply_filters('status_save_pre',    $post_status);
+                $post_name       = apply_filters('name_save_pre',      $post_name);
+                $comment_status  = apply_filters('comment_status_pre', $comment_status);
+                $ping_status     = apply_filters('ping_status_pre',    $ping_status);
+        }
 
         // Make sure we set a valid category
@@ -545 +547 @@
                         $post_date_gmt = get_gmt_from_date($post_date);
         }
-
+                
         if ( 'publish' == $post_status ) {
                 $now = gmdate('Y-m-d H:i:59');
@@ -659 +661 @@
 
         if ($post_status == 'publish' && $post_type == 'post') {
-                wp_publish_post($post_ID);
+                do_action('publish_post', $post_ID);
+
+                if ( !defined('WP_IMPORTING') ) {
+                        if ( $post_pingback )
+                                $result = $wpdb->query("
+                                        INSERT INTO $wpdb->postmeta 
+                                        (post_id,meta_key,meta_value) 
+                                        VALUES ('$post_ID','_pingme','1')
+                                ");
+                        $result = $wpdb->query("
+                                INSERT INTO $wpdb->postmeta 
+                                (post_id,meta_key,meta_value) 
+                                VALUES ('$post_ID','_encloseme','1')
+                        ");
+                        wp_schedule_single_event(time(), 'do_pings');
+                }
         } else if ($post_type == 'page') {
                 wp_cache_delete('all_page_ids', 'pages');
@@ -673 +690 @@
 
         if ( 'future' == $post_status ) {
+                wp_clear_scheduled_hook('publish_future_post', $post_ID);
                 wp_schedule_single_event(mysql2date('U', $post_date), 'publish_future_post', $post_ID);
         }
@@ -723 +741 @@
 
 function wp_publish_post($post_id) {
-        global $wpdb;
-
         $post = get_post($post_id);
 
@@ -730 +746 @@
                 return;
 
-        if ( 'publish' != $post->post_status )
-                $wpdb->query("UPDATE IGNORE $wpdb->posts SET post_status = 'publish' WHERE ID = $post_id");
-
-        do_action('publish_post', $post_id);
-
-        if ( defined('WP_IMPORTING') )
+        if ( 'publish' == $post->post_status )
                 return;
 
-        $post_pingback = get_option('default_pingback_flag');
-        if ( $post_pingback )
-                $result = $wpdb->query("
-                        INSERT INTO $wpdb->postmeta 
-                        (post_id,meta_key,meta_value) 
-                        VALUES ('$post_ID','_pingme','1')
-                ");
-
-        $result = $wpdb->query("
-                        INSERT INTO $wpdb->postmeta 
-                        (post_id,meta_key,meta_value) 
-                        VALUES ('$post_ID','_encloseme','1')
-                ");
-
-        wp_schedule_single_event(time(), 'do_pings');
+        return wp_update_post(array('post_status' => 'publish', 'ID' => $post_id, 'no_filter' => true));
 }