Changeset 47429

Timestamp:

03/04/2020 11:58:31 AM (5 years ago)

Author:

SergeyBiryukov

Message:

General: Correct the default value of the $defaults parameter in wp_parse_args() to match the documented type.

Props subrataemfluence.
See #45643.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -4350 +4350 @@
  *
  * @param string|array|object $args     Value to merge with $defaults.
- * @param array               $defaults Optional. Array that serves as the defaults. Default empty.
+ * @param array               $defaults Optional. Array that serves as the defaults.
+ *                                      Default empty array.
  * @return array Merged user defined values with defaults.
  */
-function wp_parse_args( $args, $defaults = '' ) {
+function wp_parse_args( $args, $defaults = array() ) {
     if ( is_object( $args ) ) {
         $parsed_args = get_object_vars( $args );
@@ -4362 +4363 @@
     }
 
-    if ( is_array( $defaults ) ) {
+    if ( is_array( $defaults ) && $defaults ) {
         return array_merge( $defaults, $parsed_args );
     }