Ticket #19342: 19342.diff

Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php      (revision 19417)
+++ wp-admin/includes/template.php      (working copy)
@@ -1795,4 +1795,21 @@
        }
 }
 
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
\ No newline at end of file
+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( "Do not include wp-admin/includes/template.php directly. You're giving the core developers a heart attack." );
+               return (object) array( 'id' => $hook_name, 'base' => $hook_name );
+       }
+       return WP_Screen::get( $hook_name );
+}
\ No newline at end of file
Index: wp-admin/includes/screen.php
===================================================================
--- wp-admin/includes/screen.php        (revision 19418)
+++ wp-admin/includes/screen.php        (working copy)
@@ -108,18 +108,6 @@
 }
 
 /**
- * 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 );
-}
-
-/**
  * Add contextual help text for a page.
  *
  * Creates a 'Screen Info' help tab.