Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Add missing access modifiers to WP_Customize_Nav_Menus.

Browse Source 
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-06-19 22:04:28 +00:00
parent 5e994cd6a1
commit dd2ec86e87
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,7 +515,7 @@ final class WP_Customize_Nav_Menus {
* *
* @return int * @return int
*/ */
function intval_base10( $value ) { public function intval_base10( $value ) {
return intval( $value, 10 ); return intval( $value, 10 );
} }
@ -708,7 +708,7 @@ final class WP_Customize_Nav_Menus {
* *
* @since 4.3.0 * @since 4.3.0
*/ */
function customize_preview_init() { public function customize_preview_init() {
add_action( 'template_redirect', array( $this, 'render_menu' ) ); add_action( 'template_redirect', array( $this, 'render_menu' ) );
add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) ); add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
@ -728,7 +728,7 @@ final class WP_Customize_Nav_Menus {
* @param array $args An array containing wp_nav_menu() arguments. * @param array $args An array containing wp_nav_menu() arguments.
* @return array * @return array
*/ */
function filter_wp_nav_menu_args( $args ) { public function filter_wp_nav_menu_args( $args ) {
$this->preview_nav_menu_instance_number += 1; $this->preview_nav_menu_instance_number += 1;
$args['instance_number'] = $this->preview_nav_menu_instance_number; $args['instance_number'] = $this->preview_nav_menu_instance_number;
@ -764,7 +764,7 @@ final class WP_Customize_Nav_Menus {
* @param object $args An object containing wp_nav_menu() arguments. * @param object $args An object containing wp_nav_menu() arguments.
* @return null * @return null
*/ */
function filter_wp_nav_menu( $nav_menu_content, $args ) { public function filter_wp_nav_menu( $nav_menu_content, $args ) {
if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) { if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {
$nav_menu_content = sprintf( $nav_menu_content = sprintf(
'<div id="partial-refresh-menu-container-%1$d" class="partial-refresh-menu-container" data-instance-number="%1$d">%2$s</div>', '<div id="partial-refresh-menu-container-%1$d" class="partial-refresh-menu-container" data-instance-number="%1$d">%2$s</div>',
@ -784,7 +784,7 @@ final class WP_Customize_Nav_Menus {
* @param array $args The arguments to hash. * @param array $args The arguments to hash.
* @return string * @return string
*/ */
function hash_nav_menu_args( $args ) { public function hash_nav_menu_args( $args ) {
return wp_hash( wp_create_nonce( self::RENDER_AJAX_ACTION ) . serialize( $args ) ); return wp_hash( wp_create_nonce( self::RENDER_AJAX_ACTION ) . serialize( $args ) );
} }
@ -793,7 +793,7 @@ final class WP_Customize_Nav_Menus {
* *
* @since 4.3.0 * @since 4.3.0
*/ */
function customize_preview_enqueue_deps() { public function customize_preview_enqueue_deps() {
wp_enqueue_script( 'customize-preview-nav-menus' ); wp_enqueue_script( 'customize-preview-nav-menus' );
wp_enqueue_style( 'customize-preview' ); wp_enqueue_style( 'customize-preview' );
@ -805,7 +805,7 @@ final class WP_Customize_Nav_Menus {
* *
* @since 4.3.0 * @since 4.3.0
*/ */
function export_preview_data() { public function export_preview_data() {
// Why not wp_localize_script? Because we're not localizing, and it forces values into strings. // Why not wp_localize_script? Because we're not localizing, and it forces values into strings.
$exports = array( $exports = array(
@ -835,7 +835,7 @@ final class WP_Customize_Nav_Menus {
* *
* @see wp_nav_menu() * @see wp_nav_menu()
*/ */
function render_menu() { public function render_menu() {
if ( empty( $_POST[ self::RENDER_QUERY_VAR ] ) ) { if ( empty( $_POST[ self::RENDER_QUERY_VAR ] ) ) {
return; return;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32874'; $wp_version = '4.3-alpha-32875';
/** /**
* 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.