- Patch #147000 by Berdir: unify and rewrite module_rebuild_cache() and system_theme_data().

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/system/system.install b/modules/system/system.install
index 8f856e1d7..5a68e7007 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -353,7 +353,7 @@ function system_install() {
   }
 
   // Load system theme data appropriately.
-  system_theme_data();
+  system_get_theme_data();
 
   // Inserting uid 0 here confuses MySQL -- the next user might be created as
   // uid 2 which is not what we want. So we insert the first user here, the
@@ -1542,8 +1542,8 @@ function system_update_6008() {
   db_drop_field($ret, 'system', 'description');
 
   // Rebuild system table contents.
-  module_rebuild_cache();
-  system_theme_data();
+  system_get_module_data();
+  system_get_theme_data();
 
   return $ret;
 }
@@ -1614,8 +1614,8 @@ function system_update_6012() {
  */
 function system_update_6013() {
   // Rebuild system table contents.
-  module_rebuild_cache();
-  system_theme_data();
+  system_get_module_data();
+  system_get_theme_data();
 
   return array(array('success' => TRUE, 'query' => 'Cache rebuilt.'));
 }