Changeset 18949

Timestamp:

10/12/2011 04:22:50 PM (13 years ago)

Author:

nacin

Message:

Don't instantiate WP_Screen in convert_to_screen() for now. see #18785.

File:

• trunk/wp-admin/includes/screen.php (modified) (3 diffs)

trunk/wp-admin/includes/screen.php

@@ -232 +232 @@
 
     $screen = (string) apply_filters( 'screen_meta_screen', $screen );
-    $screen = new WP_Screen( $screen );
+    $screen = (object) array( 'id' => $screen, 'base' => $screen );
     return $screen;
 }
@@ -249 +249 @@
  */
 function add_contextual_help( $screen, $help ) {
-    if ( is_string( $screen ) )
-        $screen = convert_to_screen( $screen );
-
-    $screen->add_old_compat_help( $help );
+    WP_Screen::add_old_compat_help( $screen, $help );
 }
 
@@ -561 +558 @@
     }
 
-    function add_old_compat_help( $help ) {
-        self::$_old_compat_help[ $this->id ] = $help;   
+    static function add_old_compat_help( $screen, $help ) {
+        self::$_old_compat_help[ $screen ] = $help; 
     }