Merge 4af34e8 into 09a8977

Author: superdav42

tests/WP_Ultimo/Dashboard_Widgets_Test.php

@@ -162,8 +162,10 @@ public function test_enqueue_scripts_enqueues_activity_stream_on_index(): void {
 				$wp_scripts->queue = $original_queue;
 				$wp_scripts->done  = $original_done;
 			}
-			if ($original_screen_id) {
+			if (null !== $original_screen_id) {
 				set_current_screen($original_screen_id);
+			} else {
+				unset($GLOBALS['current_screen']);
 			}
 			$pagenow = $original;
 		}
@@ -209,8 +211,10 @@ public function test_enqueue_scripts_skips_activity_stream_on_per_site_dashboard
 				$wp_scripts->queue = $original_queue;
 				$wp_scripts->done  = $original_done;
 			}
-			if ($original_screen_id) {
+			if (null !== $original_screen_id) {
 				set_current_screen($original_screen_id);
+			} else {
+				unset($GLOBALS['current_screen']);
 			}
 			$pagenow = $original;
 		}