Changeset 19063

Timestamp:

10/25/2011 06:54:23 AM (14 years ago)

Author:

nacin

Message:

Make convert_to_screen() more resilient. see #18785.

File:

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

trunk/wp-admin/includes/screen.php

@@ -402 +402 @@
         $action = $post_type = $taxonomy = '';
 
+        if ( $hook_name )
+            $id = $hook_name;
+        else
+            $id = $GLOBALS['hook_suffix'];
+
+        $id = str_replace( '.php', '', $id );
+        if ( in_array( substr( $id, -4 ), array( '-add', '-new' ) ) )
+            $action = 'add';
+        $id = str_replace( array( '-new', '-add' ), '', $id );
+
         if ( $hook_name ) {
-            if ( '-network' == substr( $hook_name, -8 ) )
-                $hook_name = str_replace( '-network', '', $hook_name );
-            elseif ( '-user' == substr( $hook_name, -5 ) )
-                $hook_name = str_replace( '-user', '', $hook_name );
-            $id = sanitize_key( $hook_name );
+            if ( '-network' == substr( $id, -8 ) )
+                $id = str_replace( '-network', '', $id );
+            elseif ( '-user' == substr( $id, -5 ) )
+                $id = str_replace( '-user', '', $id );
+
+            $id = sanitize_key( $id );
             if ( false !== strpos( $id, '-' ) ) {
                 list( $id, $second ) = explode( '-', $id, 2 );
@@ -419 +430 @@
                 }
             }
-        } else {
-            $id = $GLOBALS['hook_suffix'];
-            $id = str_replace( '.php', '', $id );
-            if ( in_array( substr( $id, -4 ), array( '-add', '-new' ) ) )
-                $action = 'add';
-            $id = str_replace( array( '-new', '-add' ), '', $id );
-        }
+        }
 
         if ( 'index' == $id )