From 2cb9f597b2c95221a89ec3ae0fe3b497ca840550 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 15 Sep 2011 08:17:02 +0000 Subject: [PATCH] Backport from trunk - Moved schema check after the locale initialization, so we get translated messages from the schema check git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@20993 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/main.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index 70432abcb..afb381c18 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -78,13 +78,6 @@ $config= session::global_get('config'); $config->check_and_reload(); $config->configRegistry->reload(); -// Validate LDAP schema if not done already -if( $config->boolValueIsTrue('core','schemaCheck') && - !$config->configRegistry->schemaCheckFinished() && - !$config->configRegistry->validateSchemata($force=FALSE,$disableIncompatiblePlugins=TRUE)){ - $config->configRegistry->displayRequirementErrors(); -} - /* Enable compressed output */ if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){ ob_start("ob_gzhandler"); @@ -149,6 +142,13 @@ setlocale(LC_ALL, $lang); $GLOBALS['t_language']= $lang; $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/'; +// Validate LDAP schema if not done already +if( $config->boolValueIsTrue('core','schemaCheck') && + !$config->configRegistry->schemaCheckFinished() && + !$config->configRegistry->validateSchemata($force=FALSE,$disableIncompatiblePlugins=TRUE)){ + $config->configRegistry->displayRequirementErrors(); +} + /* Check if the config is up to date */ $config->check_config_version(); -- 2.30.2