Skip to content

Commit 413f59c

Browse files
Coding Standards: Use strict comparison in wp-admin/includes/menu.php.
Includes minor code layout fixes for better readability. Follow-up to [3536], [4093], [9578], [11092], [18034]. Props aristath, poena, afercia, SergeyBiryukov. See #57839. git-svn-id: https://develop.svn.wordpress.org/trunk@55873 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 4dbb202 commit 413f59c

1 file changed

Lines changed: 29 additions & 13 deletions

File tree

src/wp-admin/includes/menu.php

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@
4444
// Create list of page plugin hook names.
4545
foreach ( $menu as $menu_page ) {
4646
$pos = strpos( $menu_page[2], '?' );
47+
4748
if ( false !== $pos ) {
4849
// Handle post_type=post|page|foo pages.
4950
$hook_name = substr( $menu_page[2], 0, $pos );
5051
$hook_args = substr( $menu_page[2], $pos + 1 );
5152
wp_parse_str( $hook_args, $hook_args );
53+
5254
// Set the hook name to be the post type.
5355
if ( isset( $hook_args['post_type'] ) ) {
5456
$hook_name = $hook_args['post_type'];
@@ -59,6 +61,7 @@
5961
} else {
6062
$hook_name = basename( $menu_page[2], '.php' );
6163
}
64+
6265
$hook_name = sanitize_title( $hook_name );
6366

6467
if ( isset( $compat[ $hook_name ] ) ) {
@@ -98,17 +101,20 @@
98101
if ( empty( $submenu[ $data[2] ] ) ) {
99102
continue;
100103
}
104+
101105
$subs = $submenu[ $data[2] ];
102106
$first_sub = reset( $subs );
103107
$old_parent = $data[2];
104108
$new_parent = $first_sub[2];
109+
105110
/*
106111
* If the first submenu is not the same as the assigned parent,
107112
* make the first submenu the new parent.
108113
*/
109-
if ( $new_parent != $old_parent ) {
114+
if ( $new_parent !== $old_parent ) {
110115
$_wp_real_parent_file[ $old_parent ] = $new_parent;
111-
$menu[ $id ][2] = $new_parent;
116+
117+
$menu[ $id ][2] = $new_parent;
112118

113119
foreach ( $submenu[ $old_parent ] as $index => $data ) {
114120
$submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
@@ -171,7 +177,8 @@
171177
if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
172178
$subs = $submenu[ $data[2] ];
173179
$first_sub = reset( $subs );
174-
if ( $data[2] == $first_sub[2] ) {
180+
181+
if ( $data[2] === $first_sub[2] ) {
175182
unset( $submenu[ $data[2] ] );
176183
}
177184
}
@@ -217,32 +224,36 @@ function add_menu_classes( $menu ) {
217224
$first_item = false;
218225
$last_order = false;
219226
$items_count = count( $menu );
220-
$i = 0;
227+
228+
$i = 0;
221229

222230
foreach ( $menu as $order => $top ) {
223231
$i++;
224232

225-
if ( 0 == $order ) { // Dashboard is always shown/single.
233+
if ( 0 === $order ) { // Dashboard is always shown/single.
226234
$menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
227235
$last_order = 0;
228236
continue;
229237
}
230238

231239
if ( str_starts_with( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
232-
$first_item = true;
233-
$classes = $menu[ $last_order ][4];
240+
$first_item = true;
241+
$classes = $menu[ $last_order ][4];
242+
234243
$menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );
235244
continue;
236245
}
237246

238247
if ( $first_item ) {
239-
$classes = $menu[ $order ][4];
248+
$first_item = false;
249+
$classes = $menu[ $order ][4];
250+
240251
$menu[ $order ][4] = add_cssclass( 'menu-top-first', $classes );
241-
$first_item = false;
242252
}
243253

244254
if ( $i === $items_count ) { // Last item.
245-
$classes = $menu[ $order ][4];
255+
$classes = $menu[ $order ][4];
256+
246257
$menu[ $order ][4] = add_cssclass( 'menu-top-last', $classes );
247258
}
248259

@@ -272,10 +283,12 @@ function add_menu_classes( $menu ) {
272283
*/
273284
if ( apply_filters( 'custom_menu_order', false ) ) {
274285
$menu_order = array();
286+
275287
foreach ( $menu as $menu_item ) {
276288
$menu_order[] = $menu_item[2];
277289
}
278290
unset( $menu_item );
291+
279292
$default_menu_order = $menu_order;
280293

281294
/**
@@ -290,8 +303,9 @@ function add_menu_classes( $menu ) {
290303
*
291304
* @param array $menu_order An ordered array of menu items.
292305
*/
293-
$menu_order = apply_filters( 'menu_order', $menu_order );
294-
$menu_order = array_flip( $menu_order );
306+
$menu_order = apply_filters( 'menu_order', $menu_order );
307+
$menu_order = array_flip( $menu_order );
308+
295309
$default_menu_order = array_flip( $default_menu_order );
296310

297311
/**
@@ -304,14 +318,16 @@ function add_menu_classes( $menu ) {
304318
*/
305319
function sort_menu( $a, $b ) {
306320
global $menu_order, $default_menu_order;
321+
307322
$a = $a[2];
308323
$b = $b[2];
324+
309325
if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
310326
return -1;
311327
} elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
312328
return 1;
313329
} elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
314-
if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
330+
if ( $menu_order[ $a ] === $menu_order[ $b ] ) {
315331
return 0;
316332
}
317333
return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;

0 commit comments

Comments
 (0)