Changeset 4189

Timestamp:

09/13/2006 11:54:15 PM (18 years ago)

Author:

ryan

Message:

cron and future post publishing fixes. fixes #3058

Location:

trunk

Files:

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

trunk/wp-cron.php

@@ -7 +7 @@
     exit;
 
-$crons = get_option('cron');
+$crons = _get_cron_array();
 $keys = array_keys($crons);
 if (!is_array($crons) || $keys[0] > time())
@@ -13 +13 @@
 foreach ($crons as $timestamp => $cronhooks) {
     if ($timestamp > time()) break;
-    foreach($cronhooks as $hook => $args) {
-        do_action($hook, $args['args']);
-        $schedule = $args['schedule'];
-        if($schedule != false) {
-            $args = array_merge( array($timestamp, $schedule, $hook), $args['args']);
-            call_user_func_array('wp_reschedule_event', $args);
+    foreach ($cronhooks as $hook => $keys) {
+        foreach ($keys as $key => $args) {
+            do_action_ref_array($hook, $args['args']);
+            $schedule = $args['schedule'];
+            if ($schedule != false) {
+                $args = array_merge( array($timestamp, $schedule, $hook), $args['args']);
+                call_user_func_array('wp_reschedule_event', $args);
+            }
+            wp_unschedule_event($timestamp, $hook);
         }
-        wp_unschedule_event($timestamp, $hook);
+        wp_unschedule_event($timestamp, $hook, $args);
     }
 }

trunk/wp-includes/cron.php

@@ -3 +3 @@
 function wp_schedule_single_event( $timestamp, $hook ) {
     $args = array_slice( func_get_args(), 2 );
-    $crons = get_option( 'cron' );
-    $crons[$timestamp][$hook] = array( 'schedule' => false, 'args' => $args );
+    $crons = _get_cron_array();
+    $key = md5(serialize($args));
+    $crons[$timestamp][$hook][$key] = array( 'schedule' => false, 'args' => $args );
     ksort( $crons );
-    update_option( 'cron', $crons );
+    _set_cron_array( $crons );
 }
 
 function wp_schedule_event( $timestamp, $recurrence, $hook ) {
     $args = array_slice( func_get_args(), 3 );
-    $crons = get_option( 'cron' );
+    $crons = _get_cron_array();
     $schedules = wp_get_schedules();
+    $key = md5(serialize($args));
     if ( !isset( $schedules[$recurrence] ) )
         return false;
-    $crons[$timestamp][$hook] = array( 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+    $crons[$timestamp][$hook][$key] = array( 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
     ksort( $crons );
-    update_option( 'cron', $crons );
+    _set_cron_array( $crons );
 }
 
 function wp_reschedule_event( $timestamp, $recurrence, $hook ) {
     $args = array_slice( func_get_args(), 3 );
-    $crons = get_option( 'cron' );
+    $crons = _get_cron_array();
     $schedules = wp_get_schedules();
+    $key = md5(serialize($args));
     $interval = 0;
 
@@ -31 +34 @@
     // Now we try to get it from the saved interval in case the schedule disappears
     if ( 0 == $interval )
-        $interval = $crons[$timestamp][$hook]['interval'];
+        $interval = $crons[$timestamp][$hook][$key]['interval'];
     // Now we assume something is wrong and fail to schedule
     if ( 0 == $interval )
@@ -39 +42 @@
         $timestamp += $interval;
 
-    wp_schedule_event( $timestamp, $recurrence, $hook );
+    wp_schedule_event( $timestamp, $recurrence, $hook, $args );
 }
 
-function wp_unschedule_event( $timestamp, $hook ) {
-    $crons = get_option( 'cron' );
-    unset( $crons[$timestamp][$hook] );
+function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
+    $crons = _get_cron_array();
+    $key = md5(serialize($args));
+    unset( $crons[$timestamp][$hook][$key] );
+    if ( empty($crons[$timestamp][$hook]) )
+        unset( $crons[$timestamp][$hook] );
     if ( empty($crons[$timestamp]) )
         unset( $crons[$timestamp] );
-    update_option( 'cron', $crons );
+    _set_cron_array( $crons );
 }
 
@@ -54 +60 @@
     
     while ( $timestamp = wp_next_scheduled( $hook, $args ) )
-        wp_unschedule_event( $timestamp, $hook );
+        wp_unschedule_event( $timestamp, $hook, $args );
 }
 
-function wp_next_scheduled( $hook, $args = '' ) {
-    $crons = get_option( 'cron' );
+function wp_next_scheduled( $hook, $args = array() ) {
+    $crons = _get_cron_array();
+    $key = md5(serialize($args));
     if ( empty($crons) )
         return false;
-    foreach ( $crons as $timestamp => $cron )
-        if ( isset( $cron[$hook] ) ) {
-            if ( empty($args) )
-                return $timestamp;
-            if ( $args == $cron[$hook]['args'] )
-                return $timestamp;
-        }
+    foreach ( $crons as $timestamp => $cron ) {
+        if ( isset( $cron[$hook][$key] ) )
+            return $timestamp;
+    }
     return false;
 }
 
 function spawn_cron() {
-    $crons = get_option( 'cron' );
+    $crons = _get_cron_array();
     
     if ( !is_array($crons) )
@@ -93 +97 @@
 
 function wp_cron() {
-    $crons = get_option( 'cron' );
+    $crons = _get_cron_array();
     
     if ( !is_array($crons) )
@@ -122 +126 @@
 }
 
+//
+// Private functions
+//
+
+function _get_cron_array()  {
+    $cron = get_option('cron');
+    if ( ! is_array($cron) )
+        return false;
+
+    if ( !isset($cron['version']) )
+        $cron = _upgrade_cron_array($cron);
+
+    unset($cron['version']);
+
+    return $cron;
+}
+
+function _set_cron_array($cron) {
+    $cron['version'] = 2;
+    update_option( 'cron', $cron );
+}
+
+function _upgrade_cron_array($cron) {
+    if ( isset($cron['version']) && 2 == $cron['version'])
+        return $cron;
+
+    $new_cron = array();
+
+    foreach ($cron as $timestamp => $hooks) {
+        foreach ( $hooks as $hook => $args ) {
+            $key = md5(serialize($args['args']));
+            $new_cron[$timestamp][$hook][$key] = $args;
+        }
+    }
+
+    $new_cron['version'] = 2;
+    update_option( 'cron', $new_cron );
+    return $new_cron;
+}
+
 ?>

trunk/wp-includes/post.php

@@ -699 +699 @@
     // Schedule publication.
     if ( 'future' == $post_status )
-        wp_schedule_single_event(mysql2date('U', $post_date), 'publish_future_post', $post_ID);
+        wp_schedule_single_event(strtotime($post->post_date_gmt. ' GMT'), 'publish_future_post', $post_ID);
         
     do_action('save_post', $post_ID);