From 287467334e9ffc73fb1beeeda8a8eaf2604db6ae Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 8 Oct 2006 17:50:21 +0000 Subject: [PATCH] Change cron arg passing. Props masquerade. fixes #3169. git-svn-id: http://svn.automattic.com/wordpress/trunk@4362 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/upgrade-functions.php | 2 +- wp-cron.php | 2 +- wp-includes/cron.php | 9 +++------ wp-includes/post.php | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index 2f98d1d8f..c9317cf17 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -503,7 +503,7 @@ function upgrade_210() { $posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'"); if ( !empty($posts) ) foreach ( $posts as $post ) - wp_schedule_single_event(mysql2date('U', $post->post_date), 'publish_future_post', $post->ID); + wp_schedule_single_event(mysql2date('U', $post->post_date), 'publish_future_post', array($post->ID)); } if ( $wp_current_db_version < 3570 ) { // Create categories for link categories if a category with the same diff --git a/wp-cron.php b/wp-cron.php index d99260114..45cb9f32f 100644 --- a/wp-cron.php +++ b/wp-cron.php @@ -17,7 +17,7 @@ foreach ($crons as $timestamp => $cronhooks) { do_action_ref_array($hook, $args['args']); $schedule = $args['schedule']; if ($schedule != false) { - $new_args = array_merge( array($timestamp, $schedule, $hook), $args['args']); + $new_args = array($timestamp, $schedule, $hook, $args['args']); call_user_func_array('wp_reschedule_event', $new_args); } wp_unschedule_event($timestamp, $hook, $args['args']); diff --git a/wp-includes/cron.php b/wp-includes/cron.php index f5f6a9803..75742f8ca 100644 --- a/wp-includes/cron.php +++ b/wp-includes/cron.php @@ -1,7 +1,6 @@ false, 'args' => $args ); @@ -9,8 +8,7 @@ function wp_schedule_single_event( $timestamp, $hook ) { _set_cron_array( $crons ); } -function wp_schedule_event( $timestamp, $recurrence, $hook ) { - $args = array_slice( func_get_args(), 3 ); +function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) { $crons = _get_cron_array(); $schedules = wp_get_schedules(); $key = md5(serialize($args)); @@ -21,8 +19,7 @@ function wp_schedule_event( $timestamp, $recurrence, $hook ) { _set_cron_array( $crons ); } -function wp_reschedule_event( $timestamp, $recurrence, $hook ) { - $args = array_slice( func_get_args(), 3 ); +function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array()) { $crons = _get_cron_array(); $schedules = wp_get_schedules(); $key = md5(serialize($args)); diff --git a/wp-includes/post.php b/wp-includes/post.php index 1968714b5..dbff2c36a 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -698,7 +698,7 @@ function wp_insert_post($postarr = array()) { // Schedule publication. if ( 'future' == $post_status ) - wp_schedule_single_event(strtotime($post_date_gmt. ' GMT'), 'publish_future_post', $post_ID); + wp_schedule_single_event(strtotime($post_date_gmt. ' GMT'), 'publish_future_post', array($post_ID)); do_action('save_post', $post_ID); do_action('wp_insert_post', $post_ID);