Changeset 37629

Timestamp:

06/02/2016 10:28:17 PM (10 years ago)

Author:

jeremyfelt

Message:

Multisite: Remove superfluous code from network_edit_site_nav()

• Remove output buffering.
• Remove esc_attr() when outputting hard coded class names.
• Update documentation.

Fixes #15800.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (6 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -1031 +1031 @@
 
 /**
- * Outputs the HTML for a network's "Edit Site" tabular interface
+ * Outputs the HTML for a network's "Edit Site" tabular interface.
  *
  * @since 4.6.0
- *
- * @link https://core.trac.wordpress.org/ticket/15800 discussion
  *
  * @param $args {
@@ -1041 +1039 @@
  *
  *     @type int     $blog_id   The site ID. Default is the current site.
- *     @type array   $links     The tabs to include with (label|url|cap) keys
- *     @type string  $selected  The ID of the selected link
+ *     @type array   $links     The tabs to include with (label|url|cap) keys.
+ *     @type string  $selected  The ID of the selected link.
  * }
  */
@@ -1048 +1046 @@
 
         /**
-         * Filters the links that appear on site-editing network pages
-         *
-         * Default links: 'site-info', 'site-users', 'site-themes', and 'site-settings'
+         * Filters the links that appear on site-editing network pages.
+         *
+         * Default links: 'site-info', 'site-users', 'site-themes', and 'site-settings'.
          *
          * @since 4.6.0
          *
-         * @param array Array of link data.
+         * @param array $links {
+         *     An array of link data representing individual network admin pages.
+         *
+         *     @type array $link_slug {
+         *         An array of information about the individual link to a page.
+         *
+         *         $type string $label Label to use for the link.
+         *         $type string $url   URL, relative to `network_admin_url()` to use for the link.
+         *         $type string $cap   Capability required to see the link.
+         *     }
+         * }
          */
         $links = apply_filters( 'network_edit_site_nav_links', array(
@@ -1090 +1098 @@
 
                 // Escape each class
-                $esc_classes = implode( ' ', array_map( 'esc_attr', $classes ) );
+                $esc_classes = implode( ' ', $classes );
 
                 // Get the URL for this link
@@ -1098 +1106 @@
                 $screen_links[ $link_id ] = '<a href="' . esc_url( $url ) . '" id="' . esc_attr( $link_id ) . '" class="' . $esc_classes . '">' . esc_html( $link['label'] ) . '</a>';
         }
-
-        // Start a buffer
-        ob_start();
 
         // All done!
@@ -1106 +1111 @@
         echo implode( '', $screen_links );
         echo '</h2>';
-
-        // Output the nav
-        echo ob_get_clean();
-}
+}