summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/common.inc7
1 files changed, 3 insertions, 4 deletions
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();
+
?>