Ticket #32422: 32422.1.patch

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

@@ -335 +335 @@
                                 break;
                 }
 
-                if ( 'network' == $in_admin ) {
-                        $id   .= '-network';
-                        $base .= '-network';
-                } elseif ( 'user' == $in_admin ) {
-                        $id   .= '-user';
-                        $base .= '-user';
-                }
-
                 if ( isset( self::$_registry[ $id ] ) ) {
                         $screen = self::$_registry[ $id ];
                         if ( $screen === get_current_screen() )

src/wp-admin/includes/plugin.php

@@ -1708 +1708 @@
 
         $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
 
-        return $page_type . '_page_' . $plugin_name;
+        $hookname = $page_type . '_page_' . $plugin_name;
+
+        // Modify hookname based if network/user dashboard
+        if ( is_network_admin() ) {
+                $hookname .= '-network';
+        } elseif ( is_user_admin() ) {
+                $hookname .= '-user';
+        }
+
+        return $hookname;
 }
 
 /**