Changeset 19249

Timestamp:

11/10/2011 09:06:57 PM (14 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-admin/includes/schema.php (modified) (2 diffs)

trunk/wp-admin/includes/schema.php

@@ -342 +342 @@
     } else {
         $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;
+        }
     }
 
@@ -395 +404 @@
     'default_email_category' => 1,
     'recently_edited' => '',
-    'template' => WP_DEFAULT_THEME,
+    'template' => $template,
     'stylesheet' => WP_DEFAULT_THEME,
     'comment_whitelist' => 1,