From 71217b2bc43274d2731fba45865866c3183cf981 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Fri, 24 Sep 2021 00:21:49 -0400
Subject: [PATCH] PMCORE-3368 Array access to undefined index

---
 workflow/engine/classes/model/Language.php | 2 +-
 workflow/engine/classes/model/Users.php    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php
index e0457eddc..f2320926d 100644
--- a/workflow/engine/classes/model/Language.php
+++ b/workflow/engine/classes/model/Language.php
@@ -933,8 +933,8 @@ class Language extends BaseLanguage
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             $aRow = $oDataset->getRow();
-            $aRow['LANGUAGE_NAME'] = $aRow['LAN_NAME'];
             if (is_array($aRow)) {
+                $aRow['LANGUAGE_NAME'] = $aRow['LAN_NAME'];
                 return $aRow;
             } else {
                 throw (new Exception("The language '$langId' doesn\'t exist!"));
diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index 6cd8ae1cd..0248b22ba 100644
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -195,6 +195,9 @@ class Users extends BaseUsers
                 $role = $roles->loadByCode($aFields['USR_ROLE']);
                 $aFields['USR_ROLE_NAME'] = $role['ROL_NAME'];
 
+                if (empty($aFields['USR_DEFAULT_LANG'])) {
+                    $aFields['USR_DEFAULT_LANG'] = 'en';
+                }
                 $translations = new Language();
                 $translation  = $translations->loadByCode($aFields['USR_DEFAULT_LANG']);
                 $aFields['USR_DEFAULT_LANG_NAME'] = $translation['LANGUAGE_NAME'];