golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly handle child themes for WP_DEFAULT_THEME. Props SergeyBiryukov. fixes #18591 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-11-10 21:06:57 +00:00
parent 5299994ce5
commit ba9bd2e208
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/includes/schema.php
View File

@ -343,6 +343,15 @@ function populate_options() {
$uploads_use_yearmonth_folders = 1;
}
$template = WP_DEFAULT_THEME;
// If default theme is a child theme, we need to get its template
foreach ( (array) get_themes() as $theme ) {
if ( WP_DEFAULT_THEME == $theme['Stylesheet'] ) {
$template = $theme['Template'];
break;
}
}
$options = array(
'siteurl' => $guessurl,
'blogname' => __('My Site'),
@ -394,7 +403,7 @@ function populate_options() {
// 1.5
'default_email_category' => 1,
'recently_edited' => '',
'template' => WP_DEFAULT_THEME,
'template' => $template,
'stylesheet' => WP_DEFAULT_THEME,
'comment_whitelist' => 1,
'blacklist_keys' => '',