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

Customizer: Remove a line of commented-out code in `WP_Customize_Nav_Menus::customize_register()`. 

Retains a more explicit future-compat version of the todo notation that used to accompany the commented-out code.

Props harsh175, dlh.
Fixes #44633.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2018-12-19 07:23:47 +00:00
parent 095e1c7f89
commit 4f35907147
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-customize-nav-menus.php
View File

@ -595,6 +595,11 @@ final class WP_Customize_Nav_Menus {
} else { } else {
$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>'; $description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
} }
/*
* Once multiple theme supports are allowed in WP_Customize_Panel,
* this panel can be restricted to themes that support menus or widgets.
*/
$this->manager->add_panel( $this->manager->add_panel(
new WP_Customize_Nav_Menus_Panel( new WP_Customize_Nav_Menus_Panel(
$this->manager, $this->manager,
@ -603,7 +608,6 @@ final class WP_Customize_Nav_Menus {
'title' => __( 'Menus' ), 'title' => __( 'Menus' ),
'description' => $description, 'description' => $description,
'priority' => 100, 'priority' => 100,
// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
) )
) )
); );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44327'; $wp_version = '5.1-alpha-44328';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.