Merge pull request #545 from john-shaffer/544-fix-queueing-jobs

Fix job queueing when a post is saved or trashed.
elementor · May 4, 2020 · b3e08f5 · b3e08f5
2 parents 973cc16 + 3cfea12
commit b3e08f5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 33 deletions.
diff --git a/src/Controller.php b/src/Controller.php
@@ -395,15 +395,16 @@ public static function wp2static_ui_save_job_options() : void {
     }
 
     public static function wp2static_save_post_handler( int $post_id ) : void {
-        if ( get_post_status( $post_id ) !== 'publish' ) {
-            return;
+        if ( CoreOptions::getValue( 'queueJobOnPostSave' ) &&
+             get_post_status( $post_id ) === 'publish' ) {
+            self::wp2static_enqueue_jobs();
         }
-
-        self::wp2static_enqueue_jobs();
     }
 
     public static function wp2static_trashed_post_handler() : void {
-        self::wp2static_enqueue_jobs();
+        if ( CoreOptions::getValue( 'queueJobOnPostDelete' ) ) {
+            self::wp2static_enqueue_jobs();
+        }
     }
 
     public static function wp2static_enqueue_jobs() : void {

diff --git a/src/CoreOptions.php b/src/CoreOptions.php
@@ -421,34 +421,6 @@ public static function savePosted( string $screen = 'core' ) : void {
                     [ 'name' => 'queueJobOnPostDelete' ]
                 );
 
-                if ( $queue_on_post_save ) {
-                    add_action(
-                        'save_post',
-                        [ 'WP2Static\Controller', 'wp2static_save_post_handler' ],
-                        0
-                    );
-                } else {
-                    remove_action(
-                        'save_post',
-                        [ 'WP2Static\Controller', 'wp2static_save_post_handler' ],
-                        0
-                    );
-                }
-
-                if ( $queue_on_post_delete ) {
-                    add_action(
-                        'trashed_post',
-                        [ 'WP2Static\Controller', 'wp2static_trashed_post_handler' ],
-                        0
-                    );
-                } else {
-                    remove_action(
-                        'trashed_post',
-                        [ 'WP2Static\Controller', 'wp2static_trashed_post_handler' ],
-                        0
-                    );
-                }
-
                 $process_queue_interval =
                     isset( $_POST['processQueueInterval'] ) ?
                      $_POST['processQueueInterval'] : 0;

diff --git a/src/WordPressAdmin.php b/src/WordPressAdmin.php
@@ -185,6 +185,18 @@ public static function registerHooks( string $bootstrap_file ) : void {
             1
         );
 
+        add_action(
+            'save_post',
+            [ 'WP2Static\Controller', 'wp2static_save_post_handler' ],
+            0
+        );
+
+        add_action(
+            'trashed_post',
+            [ 'WP2Static\Controller', 'wp2static_trashed_post_handler' ],
+            0
+        );
+
         /*
          * Register actions for when we should invalidate cache for
          * a URL(s) or whole site