Commit 7775d5a3 authored by Dries's avatar Dries

- 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.
parent f26d8807
......@@ -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 @@ function page_footer() {
// 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 @@ function page_footer() {
// initialize theme:
$theme = theme_init();
// initialize installed modules:
module_init();
?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment