diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-03-04 17:44:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-03-04 17:44:37 +0000 |
| commit | 7775d5a3277cc761fef92289edcdaa27809fd3a7 (patch) | |
| tree | f0335a35b635de470a255d8c5c3c9a1d2e9daa39 | |
| parent | f26d8807fc2f272542c9c7845c293daa930d0096 (diff) | |
| download | brdo-7775d5a3277cc761fef92289edcdaa27809fd3a7.tar.gz brdo-7775d5a3277cc761fef92289edcdaa27809fd3a7.tar.bz2 | |
- 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.
| -rw-r--r-- | includes/common.inc | 7 |
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(); + ?> |