From f3533ada12a24fc5cf7900a0572c7f54c6c8710e Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 9 Sep 2015 16:48:28 -0400
Subject: [PATCH] PM-3176 "Admin>Settings>Login: Al cambiar..." SOLVED

> Code Isuue:
  Admin>Settings>Login: AL cambiar el lenguaje por defecto, y queremos loguear nuevamente no respeta el idioma elegido
> Solution:
  Se agrega validacion cuando se configura el idioma en Admin>Settings>Login, al seleccionar un idioma el mismo se
  reflejara en dynaform del login el dropdown estara seleccionado con el idioma que se configuro.
---
 workflow/engine/methods/login/login.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 1957aadee..f2ccca411 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -210,12 +210,12 @@ G::LoadClass('configuration');
 $oConf = new Configurations();
 $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
-$myUrl = explode("/", $_SERVER["REQUEST_URI"]);
-
-if (isset($myUrl) && $myUrl != "") {
-    $aFields["USER_LANG"] = $myUrl[2];
+if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_defaultLanguage"] != "") {
+    $aFields["USER_LANG"] = $oConf->aConfig["login_defaultLanguage"];
 } else {
-    $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : SYS_LANG;
+    $myUrl = explode("/", $_SERVER["REQUEST_URI"]);
+
+    $aFields["USER_LANG"] = (isset($myUrl[2]) && trim($myUrl[2]) != "")? trim($myUrl[2]) : SYS_LANG;
 }
 
 $G_PUBLISH = new Publisher();