Properly check, initialize, or cast a number of variables. props ChenHui. see #14642.

git-svn-id: https://develop.svn.wordpress.org/trunk@16377 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2010-11-15 06:38:10 +00:00
parent 420e436d72
commit 8d9b2cd2b3
4 changed files with 11 additions and 10 deletions

View File

@@ -4232,7 +4232,7 @@ function get_file_data( $file, $default_headers, $context = '' ) {
foreach( $extra_headers as $key=>$value ) {
$extra_headers[$key] = $key;
}
$all_headers = array_merge($extra_headers, $default_headers);
$all_headers = array_merge( $extra_headers, (array) $default_headers );
} else {
$all_headers = $default_headers;
}