From f46826d7f07541c577e2f924b55324787cab36ed Mon Sep 17 00:00:00 2001
From: Andrea Adamczyk <andrea.adamczyk@processmaker.com>
Date: Mon, 29 Jul 2019 12:33:26 -0400
Subject: [PATCH] PMC-1012

---
 workflow/engine/classes/model/IsoCountry.php     |  2 +-
 workflow/engine/classes/model/IsoLocation.php    |  2 +-
 workflow/engine/classes/model/IsoSubdivision.php |  2 +-
 workflow/engine/methods/users/usersAjax.php      | 13 +++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/classes/model/IsoCountry.php b/workflow/engine/classes/model/IsoCountry.php
index f0ce15076..38c649b3a 100644
--- a/workflow/engine/classes/model/IsoCountry.php
+++ b/workflow/engine/classes/model/IsoCountry.php
@@ -40,7 +40,7 @@
  */
 class IsoCountry extends BaseIsoCountry
 {
-    public function findById($UID)
+    public static function findById($UID)
     {
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(IsoCountryPeer::IC_UID);
diff --git a/workflow/engine/classes/model/IsoLocation.php b/workflow/engine/classes/model/IsoLocation.php
index f78fdbb77..dc42625fd 100644
--- a/workflow/engine/classes/model/IsoLocation.php
+++ b/workflow/engine/classes/model/IsoLocation.php
@@ -40,7 +40,7 @@
  */
 class IsoLocation extends BaseIsoLocation
 {
-    public function findById($IC_UID, $IS_UID, $IL_UID)
+    public static function findById($IC_UID, $IS_UID, $IL_UID)
     {
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(IsoLocationPeer::IC_UID);
diff --git a/workflow/engine/classes/model/IsoSubdivision.php b/workflow/engine/classes/model/IsoSubdivision.php
index 41a42266c..e51a54200 100644
--- a/workflow/engine/classes/model/IsoSubdivision.php
+++ b/workflow/engine/classes/model/IsoSubdivision.php
@@ -40,7 +40,7 @@
  */
 class IsoSubdivision extends BaseIsoSubdivision
 {
-    public function findById($IC_UID, $IS_UID)
+    public static function findById($IC_UID, $IS_UID)
     {
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(IsoSubdivisionPeer::IC_UID);
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 130458084..e2d6737c5 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -232,11 +232,10 @@ switch ($_POST['action']) {
 
         $aFields['PREF_DEFAULT_MENUSELECTED'] = '';
         $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = '';
-        if (sizeof($oConf->Fields) > 0) {
-            // this user has a configuration record
-            $aFields['PREF_DEFAULT_LANG'] = $oConf->aConfig['DEFAULT_LANG'];
-            $aFields['PREF_DEFAULT_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_MENU']) ? $oConf->aConfig['DEFAULT_MENU'] : '';
-            $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_CASES_MENU']) ? $oConf->aConfig['DEFAULT_CASES_MENU'] : '';
+        $aFields['PREF_DEFAULT_LANG'] = isset($oConf->aConfig['DEFAULT_LANG']) ? $oConf->aConfig['DEFAULT_LANG'] : SYS_LANG;
+
+        if (isset($oConf->aConfig['DEFAULT_MENU'])) {
+            $aFields['PREF_DEFAULT_MENUSELECTED'] = $oConf->aConfig['DEFAULT_MENU'];
         } else {
             switch ($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']) {
                 case 'PROCESSMAKER_ADMIN':
@@ -246,8 +245,10 @@ switch ($_POST['action']) {
                     $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_CASES';
                     break;
             }
-            $aFields['PREF_DEFAULT_LANG'] = SYS_LANG;
         }
+
+        $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_CASES_MENU']) ? $oConf->aConfig['DEFAULT_CASES_MENU'] : '';
+
         if ($aFields['USR_REPLACED_BY'] != '') {
             $user = new Users();
             $u = $user->load($aFields['USR_REPLACED_BY']);