|
@@ -125,7 +125,7 @@ if ($userlogin == 'firstadmin') {
|
|
|
|
|
|
// Check user login
|
|
|
$user = new User($db);
|
|
|
-$result = $user->fetch('', $userlogin);
|
|
|
+$result = $user->fetch('', $userlogin, '', 1);
|
|
|
if ($result < 0) {
|
|
|
echo "User Error: ".$user->error;
|
|
|
dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
|
|
@@ -137,6 +137,16 @@ if ($result < 0) {
|
|
|
exit(-1);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+// Reload langs
|
|
|
+$langcode = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
|
|
|
+if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
|
|
|
+ $langcode = $user->conf->MAIN_LANG_DEFAULT;
|
|
|
+}
|
|
|
+if ($langs->getDefaultLang() != $langcode) {
|
|
|
+ $langs->setDefaultLang($langcode);
|
|
|
+}
|
|
|
+
|
|
|
$user->getrights();
|
|
|
|
|
|
if (isset($argv[3]) && $argv[3]) {
|
|
@@ -195,8 +205,8 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
|
|
|
$mysoc->setMysoc($conf);
|
|
|
|
|
|
// Force recheck that user is ok for the entity to process and reload permission for entity
|
|
|
- if ($conf->entity != $user->entity && $user->entity != 0) {
|
|
|
- $result = $user->fetch('', $userlogin, '', 0, $conf->entity);
|
|
|
+ if ($conf->entity != $user->entity) {
|
|
|
+ $result = $user->fetch('', $userlogin, '', 1);
|
|
|
if ($result < 0) {
|
|
|
echo "\nUser Error: ".$user->error."\n";
|
|
|
dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
|