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

Coding Standards: Use strict comparison in `wp-admin/includes/nav-menu.php`. 

Follow-up to [14248], [15008], [37748].

Props jenilk, johnbillion.
Fixes #57318.
Built from https://develop.svn.wordpress.org/trunk@55593


git-svn-id: http://core.svn.wordpress.org/trunk@55105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-03-26 10:06:18 +00:00
parent 95a52be05d
commit 7127052046
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/nav-menu.php
View File

@ -938,7 +938,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
$menu_id = (int) $menu_id; $menu_id = (int) $menu_id;
$items_saved = array(); $items_saved = array();
if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) { if ( 0 === $menu_id || is_nav_menu( $menu_id ) ) {
// Loop through all the menu items' POST values. // Loop through all the menu items' POST values.
foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) { foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
@ -964,7 +964,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
if ( if (
empty( $_item_object_data['menu-item-db-id'] ) || empty( $_item_object_data['menu-item-db-id'] ) ||
( 0 > $_possible_db_id ) || ( 0 > $_possible_db_id ) ||
$_possible_db_id != $_item_object_data['menu-item-db-id'] $_possible_db_id !== (int) $_item_object_data['menu-item-db-id']
) { ) {
$_actual_db_id = 0; $_actual_db_id = 0;
} else { } else {
@ -1211,7 +1211,11 @@ function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selecte
$args[ $field ] = isset( $_POST[ $field ][ $_key ] ) ? $_POST[ $field ][ $_key ] : ''; $args[ $field ] = isset( $_POST[ $field ][ $_key ] ) ? $_POST[ $field ][ $_key ] : '';
} }
$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][ $_key ] != $_key ? 0 : $_key ), $args ); $menu_item_db_id = wp_update_nav_menu_item(
$nav_menu_selected_id,
( (int) $_POST['menu-item-db-id'][ $_key ] !== $_key ? 0 : $_key ),
$arg
);
if ( is_wp_error( $menu_item_db_id ) ) { if ( is_wp_error( $menu_item_db_id ) ) {
$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>'; $messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
@ -1301,7 +1305,7 @@ function _wp_expand_nav_menu_post_data() {
// Build the new array value from leaf to trunk. // Build the new array value from leaf to trunk.
for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) { for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) {
if ( count( $array_bits ) - 1 == $i ) { if ( count( $array_bits ) - 1 === $i ) {
$new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value ); $new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
} else { } else {
$new_post_data = array( $array_bits[ $i ] => $new_post_data ); $new_post_data = array( $array_bits[ $i ] => $new_post_data );

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.3-alpha-55592'; $wp_version = '6.3-alpha-55593';
/** /**
* 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.