Changeset 10209 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php

Timestamp:

08/26/2020 07:25:50 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: Cleanup the Cron hook:$plugin code.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php

@@ -30 +30 @@
         // Register the wildcard cron hook tasks.
         if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-            //add_action( 'pre_option_cron', array( $this, 'register_colon_based_hook_handlers' ), 100 );
-        }
-        add_action( 'wporg_after_cron_event_run', array( $this, 'after_cron_event_run' ), 10, 2 );
+            // This must be run after plugins_loaded, as that's when Cavalcade hooks in.
+            add_action( 'init', array( $this, 'register_colon_based_hook_handlers' ) );
+        }
     }
 
@@ -278 +278 @@
      * These cron tasks are in the form of 'import_plugin:$slug', this maps them to their expected handlers.
      */
-    public function after_cron_event_run( $hook, $args ) {
-        if ( has_action( $hook ) ) {
-            return;
-        }
-        list( $base, ) = explode( ':', $hook, 2 );
+    public function register_colon_based_hook_handlers() {
+        $cron_array = get_option( 'cron' );
 
         $wildcard_cron_tasks = array(
@@ -290 +287 @@
         );
 
-        if ( isset( $wildcard_cron_tasks[ $base ] ) ) {
-            call_user_func_array( $wildcard_cron_tasks[ $base ], $args );
-        }
-    }
-
-    /**
-     * The WordPress Cron implementation isn't great at determining if a job is already enqueued,
-     * as a result, we use a "fake" hook to encode the plugin slug into the job name to allow us to
-     * detect if a cron task for that plugin has already been registered.
-     *
-     * These cron tasks are in the form of 'import_plugin:$slug', this maps them to their expected handlers.
-     *
-     * @param array $cron_array The Cron array.
-     * @return array The Cron array passed, unchanged.
-     */
-    public function register_colon_based_hook_handlers( $cron_array ) {
-        $wildcard_cron_tasks = array(
-            'import_plugin'      => array( __NAMESPACE__ . '\Plugin_Import', 'cron_trigger' ),
-            'import_plugin_i18n' => array( __NAMESPACE__ . '\Plugin_i18n_Import', 'cron_trigger' ),
-            'tide_sync'          => array( __NAMESPACE__ . '\Tide_Sync', 'cron_trigger' ),
-        );
-
         if ( is_array( $cron_array ) ) {
             foreach ( $cron_array as $timestamp => $handlers ) {
@@ -332 +307 @@
             }
         }
-
-        return $cron_array;
     }