WordPress.org

Make WordPress Core

Ticket #11212: 11212.patch

File 11212.patch, 761 bytes (added by Viper007Bond, 9 years ago)
  • wp-includes/functions.php

     
    27182718 * to be merged into another array.
    27192719 *
    27202720 * @since 2.2.0
     2721 * @uses apply_filters() Calls 'wp_parse_args' hook with return value as well as $args and $defaults.
    27212722 *
    27222723 * @param string|array $args Value to merge with $defaults
    27232724 * @param array $defaults Array that serves as the defaults.
     
    27322733                wp_parse_str( $args, $r );
    27332734
    27342735        if ( is_array( $defaults ) )
    2735                 return array_merge( $defaults, $r );
    2736         return $r;
     2736                $r = array_merge( $defaults, $r );
     2737
     2738        return apply_filters( 'wp_parse_args', $r, $args, $defaults );
    27372739}
    27382740
    27392741/**