Ticket #16238: 16238.2.diff

File 16238.2.diff, 706 bytes (added by kawauso, 2 years ago)

Respect existing dashboard suffixes

Line 
1Index: wp-admin/includes/template.php
2===================================================================
3--- wp-admin/includes/template.php      (revision 17306)
4+++ wp-admin/includes/template.php      (working copy)
5@@ -1661,6 +1661,14 @@
6  */
7 function convert_to_screen( $screen ) {
8        $screen = str_replace( array('.php', '-new', '-add' ), '', $screen);
9+
10+       if ( substr( $screen, -8 ) != '-network' && substr( $screen, -5 ) != '-user' ) {
11+               if ( is_network_admin() )
12+                       $screen .= '-network';
13+               else if ( is_user_admin() )
14+                       $screen .= '-user';
15+       }
16+
17        $screen = (string) apply_filters( 'screen_meta_screen', $screen );
18        $screen = (object) array('id' => $screen, 'base' => $screen);
19        return $screen;