Changeset 19428

Timestamp:

11/23/2011 09:29:33 PM (9 years ago)

Author:

ryan

Message:

Move convert_to_screen() back to template.php to avoid fatal errors with plugins and themes that direct include template.php into the front end. Flag this bad behavior with _doing_it_wrong(). Props nacin. fixes #19342

Location:

trunk/wp-admin/includes

Files:

• screen.php (modified) (1 diff)
• template.php (modified) (1 diff)

trunk/wp-admin/includes/screen.php

@@ -106 +106 @@
 
     return apply_filters( 'hidden_meta_boxes', $hidden, $screen, $use_defaults );
-}
-
-/**
- * Convert a screen string to a screen object
- *
- * @since 3.0.0
- *
- * @param string $hook_name The hook name (also known as the hook suffix) used to determine the screen.
- * @return WP_Screen Screen object.
- */
-function convert_to_screen( $hook_name ) {
-    return WP_Screen::get( $hook_name );
 }
 

trunk/wp-admin/includes/template.php

@@ -1797 +1797 @@
 
 add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
+
+/**
+ * Convert a screen string to a screen object
+ *
+ * @since 3.0.0
+ *
+ * @param string $hook_name The hook name (also known as the hook suffix) used to determine the screen.
+ * @return WP_Screen Screen object.
+ */
+function convert_to_screen( $hook_name ) {
+    if ( ! is_admin() ) {
+        _doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3' );
+        return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );
+    }
+
+    return WP_Screen::get( $hook_name );
+}