From 3a19ff15f9013f7acf6951def3937807ea87733f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 14 Oct 2020 02:14:34 +0000 Subject: [PATCH] General: Move `wp_array_get()` next to `wp_array_slice_assoc()`, for a bit more consistent placement. Follow-up to [49135], [49143]. See #51461. git-svn-id: https://develop.svn.wordpress.org/trunk@49144 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 38 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index ad623d107b..e3f9896211 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -4499,6 +4499,7 @@ function wp_parse_slug_list( $list ) { */ function wp_array_slice_assoc( $array, $keys ) { $slice = array(); + foreach ( $keys as $key ) { if ( isset( $array[ $key ] ) ) { $slice[ $key ] = $array[ $key ]; @@ -4508,24 +4509,6 @@ function wp_array_slice_assoc( $array, $keys ) { return $slice; } -/** - * Determines if the variable is a numeric-indexed array. - * - * @since 4.4.0 - * - * @param mixed $data Variable to check. - * @return bool Whether the variable is a list. - */ -function wp_is_numeric_array( $data ) { - if ( ! is_array( $data ) ) { - return false; - } - - $keys = array_keys( $data ); - $string_keys = array_filter( $keys, 'is_string' ); - return count( $string_keys ) === 0; -} - /** * Accesses an array in depth based on a path of keys. * @@ -4558,6 +4541,25 @@ function wp_array_get( $array, $path, $default = array() ) { return $array; } +/** + * Determines if the variable is a numeric-indexed array. + * + * @since 4.4.0 + * + * @param mixed $data Variable to check. + * @return bool Whether the variable is a list. + */ +function wp_is_numeric_array( $data ) { + if ( ! is_array( $data ) ) { + return false; + } + + $keys = array_keys( $data ); + $string_keys = array_filter( $keys, 'is_string' ); + + return count( $string_keys ) === 0; +} + /** * Filters a list of objects, based on a set of key => value arguments. *