WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Built from https://develop.svn.wordpress.org/trunk@37629


git-svn-id: http://core.svn.wordpress.org/trunk@37597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-06-02 22:29:27 +00:00
parent 460f4740a2
commit 2211c28a37
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-admin/includes/ms.php
View File

@ -1030,30 +1030,38 @@ jQuery(document).ready( function($) {
}
/**
* 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 {
* Optional. Array or string of Query parameters.
*
* @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.
* }
*/
function network_edit_site_nav( $args = array() ) {
/**
* Filters the links that appear on site-editing network pages
* Filters the links that appear on site-editing network pages.
*
* Default links: 'site-info', 'site-users', 'site-themes', and 'site-settings'
* 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(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php', 'cap' => 'manage_sites' ),
@ -1089,7 +1097,7 @@ function network_edit_site_nav( $args = array() ) {
}
// Escape each class
$esc_classes = implode( ' ', array_map( 'esc_attr', $classes ) );
$esc_classes = implode( ' ', $classes );
// Get the URL for this link
$url = add_query_arg( array( 'id' => $r['blog_id'] ), network_admin_url( $link['url'] ) );
@ -1098,14 +1106,8 @@ function network_edit_site_nav( $args = array() ) {
$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!
echo '<h2 class="nav-tab-wrapper wp-clearfix">';
echo implode( '', $screen_links );
echo '</h2>';
// Output the nav
echo ob_get_clean();
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37628';
$wp_version = '4.6-alpha-37629';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.