- Patch #137211 by merlinofchaos: move theme information to .info files and improved theme inheritance.

1 files changed, 12 insertions, 2 deletions

diff --git a/modules/system/system.install b/modules/system/system.install
index 7cf9b1979..c6b55878e 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1109,8 +1109,8 @@ function system_install() {
       break;
   }
 
-  db_query("INSERT INTO {system} (filename, name, type, owner, status, throttle, bootstrap, schema_version) VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0, 0)");
-  db_query("INSERT INTO {system} (filename, name, type, owner, status, throttle, bootstrap, schema_version, info) VALUES ('themes/garland/page.tpl.php', 'garland', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0, 0, '%s')", serialize(drupal_parse_info_file('themes/garland/garland.info') + system_theme_default()));
+  // Load system theme data appropriately.
+  system_theme_data();
 
   db_query("INSERT INTO {users} (uid,name,mail) VALUES(0,'','')");
 
@@ -3865,6 +3865,16 @@ function system_update_6012() {
 }
 
 /**
+ * Rebuild cache data for theme system changes
+ */
+function system_update_6013() {
+  // Rebuild system table contents.
+  module_rebuild_cache();
+  system_theme_data();
+}
+
+
+/**
  * @} End of "defgroup updates-5.x-to-6.x"
  * The next series of updates should start at 7000.
  */