From 7775d5a3277cc761fef92289edcdaa27809fd3a7 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 4 Mar 2003 17:44:37 +0000
Subject: - Fixed "SELECT lid, FROM locales WHERE string = 'Reset to defaults'"
 problem:   invoke module_init() *after* the locale module has been
 initialized.  The   system module was translating string from within its init
 hook which is now   possible/allowed.

---
 includes/common.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'includes/common.inc')

diff --git a/includes/common.inc b/includes/common.inc
index 0e8139d79..56432d14a 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -138,7 +138,6 @@ function message_throttle() {
 
 function locale_init() {
   global $languages, $user;
-
   if ($user->uid && $languages[$user->language]) {
     return $user->language;
   }
@@ -931,9 +930,6 @@ if (!function_exists("xmlrpc_decode")) {
 // initialize configuration variables, using values from conf.php if available:
 $conf = variable_init(isset($conf) ? $conf : array());
 
-// initialize installed modules:
-module_init();
-
 // set error handler:
 set_error_handler("error_handler");
 
@@ -943,4 +939,7 @@ $locale = locale_init();
 // initialize theme:
 $theme = theme_init();
 
+// initialize installed modules:
+module_init();
+
 ?>
-- 
cgit v1.2.3