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

Don't discard non-default args in wp_parse_args(). see #4237 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rob1n 2007-05-10 02:33:01 +00:00
parent 28f3106ee9
commit 56a1232923
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/functions.php
View File

@ -1500,11 +1500,7 @@ function wp_parse_args( $args, $defaults = '' ) {
}
if ( is_array( $defaults ) ) {
extract( $defaults );
extract( $r );
// Note: this only returns the variables that were in $defaults
// to begin with. All other variables are discarded.
return compact( array_keys( $defaults ) );
return array_merge( $defaults, $r );
} else {
return $r;
}