mirror of
https://github.com/WordPress/WordPress.git
synced 2025-02-02 05:31:25 +01:00
Fix array_merge of stylesheets and templates. Patch from kharris.
git-svn-id: http://svn.automattic.com/wordpress/trunk@1876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
aa2fbccf6f
commit
a80864dbf5
@ -26,7 +26,7 @@ if (empty($theme)) {
|
||||
$theme = get_current_theme();
|
||||
}
|
||||
|
||||
$allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $allowed_files, $themes[$theme]['Template Files']);
|
||||
$allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
|
||||
|
||||
if (empty($file)) {
|
||||
$file = $allowed_files[0];
|
||||
|
Loading…
Reference in New Issue
Block a user