Wordpress 3.1-scripts

[autoinstalls/wordpress.git] / wp-cron.php

diff --git a/wp-cron.php b/wp-cron.php
index f7b3fa16b3c19c9017c1fb65f1da54900bb974d6..19427c5c427c6791623a64399023dc76bc24d235 100644 (file)
--- a/wp-cron.php
+++ b/wp-cron.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * WordPress Cron Implementation for hosts, which do not offer CRON or for which
- * the user has not setup a CRON job pointing to this file.
+ * the user has not set up a CRON job pointing to this file.
  *
  * The HTTP request to this file will not slow down the visitor who happens to
  * visit when the cron job is needed to run.
@@ -11,30 +11,31 @@
 
 ignore_user_abort(true);
 
+if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+       die();
+
 /**
  * Tell WordPress we are doing the CRON task.
  *
  * @var bool
  */
 define('DOING_CRON', true);
-/** Setup WordPress environment */
-require_once('./wp-load.php');
 
-if ( $_GET['check'] != wp_hash('187425') )
-       exit;
+if ( !defined('ABSPATH') ) {
+       /** Set up WordPress environment */
+       require_once('./wp-load.php');
+}
 
-$local_time = time();
+if ( false === $crons = _get_cron_array() )
+       die();
 
-$crons = _get_cron_array();
 $keys = array_keys( $crons );
+$local_time = time();
 
-if (!is_array($crons) || $keys[0] > $local_time) {
-       update_option('doing_cron', 0);
-       return;
-}
-
-foreach ($crons as $timestamp  => $cronhooks) {
+if ( isset($keys[0]) && $keys[0] > $local_time )
+       die();
 
+foreach ($crons as $timestamp => $cronhooks) {
        if ( $timestamp > $local_time )
                break;
 
@@ -56,8 +57,4 @@ foreach ($crons as $timestamp  => $cronhooks) {
        }
 }
 
-update_option('doing_cron', 0);
-
 die();
-
-?>