[wp-trac] [WordPress Trac] #28226: menu_page_url does not return correct URL on network admin

[WordPress Trac]

#28226: menu_page_url does not return correct URL on network admin
------------------------------------+------------------------------
 Reporter:  norcross                |       Owner:
     Type:  defect (bug)            |      Status:  new
 Priority:  normal                  |   Milestone:  Awaiting Review
Component:  Menus                   |     Version:  3.0
 Severity:  normal                  |  Resolution:
 Keywords:  has-patch dev-feedback  |     Focuses:  multisite
------------------------------------+------------------------------
Changes (by DrewAPicture):

 * keywords:  has-patch dev-feedback 2nd-opinion => has-patch dev-feedback


Comment:

 The extra conditional check in [attachment:28226-plugin.php.diff] is
 unnecessary. `network_admin_url()` falls back to `admin_url()` if it isn't
 multisite, so just swaping "admin" for "network" in the two function calls
 should do it:

 {{{
 #!diff
 --- Version 1
 +++ Version 2
 @@ -1442,9 +1442,9 @@
         if ( isset( $_parent_pages[$menu_slug] ) ) {
                 $parent_slug = $_parent_pages[$menu_slug];
                 if ( $parent_slug && ! isset( $_parent_pages[$parent_slug]
 ) ) {
 -                       $url = admin_url( add_query_arg( 'page',
 $menu_slug, $parent_slug ) );
 +                       $url = network_admin_url( add_query_arg( 'page',
 $menu_slug, $parent_slug ) );
                 } else {
 -                       $url = admin_url( 'admin.php?page=' . $menu_slug
 );
 +                       $url = network_admin_url( 'admin.php?page=' .
 $menu_slug );
                 }
         } else {
                 $url = '';
 }}}

--
Ticket URL: <https://core.trac.wordpress.org/ticket/28226#comment:7>
WordPress Trac <https://core.trac.wordpress.org/>
WordPress publishing platform