Changeset 61484

Timestamp:

01/14/2026 11:57:24 PM (less than one hour ago)

Author:

SergeyBiryukov

Message:

Administration: Ensure get_current_screen() returns WP_Screen or null.

This adds a check that the $current_screen global is not only defined, but also has the correct type.

Follow-up to [15746].

Props marian1, mayanktripathi32, abcd95, im3dabasia1, SergeyBiryukov.
Fixes #62562.

Location:

trunk

Files:

• src/wp-admin/includes/screen.php (modified) (1 diff)
• tests/phpunit/tests/admin/includesScreen.php (modified) (1 diff)

trunk/src/wp-admin/includes/screen.php

@@ -225 +225 @@
     global $current_screen;
 
-    if ( ! isset( $current_screen ) ) {
+    if ( ! $current_screen instanceof WP_Screen ) {
         return null;
     }

trunk/tests/phpunit/tests/admin/includesScreen.php

@@ -452 +452 @@
     }
 
+    /**
+     * @ticket 62562
+     */
+    public function test_get_current_screen_type() {
+        global $current_screen;
+
+        set_current_screen( 'edit.php' );
+        $this->assertInstanceOf( 'WP_Screen', get_current_screen() );
+
+        $current_screen = new stdClass();
+        $this->assertNull( get_current_screen() );
+    }
+
     public function test_in_admin() {
         set_current_screen( 'edit.php' );