Merged in luisfernandosl/processmaker/HOR-1469-A-31 (pull request #4641)

HOR-1469-A
2016-07-29 14:46:15 -04:00
parent c8d9dc0989 e0445f6c4e
commit c9f8155545
1 changed files with 6 additions and 0 deletions
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -156,6 +156,12 @@ try {
                G::SendTemporalMessage($errLabel, "warning");
            }

+            $u = (array_key_exists('form', $_POST) && array_key_exists('URL', $_POST['form']))? 'u=' . urlencode($_POST['form']['URL']) : '';
+
+            if ($u != '') {
+                $urlLogin = $urlLogin . ((preg_match('/^.+\?.+$/', $urlLogin))? '&' : '?') . $u;
+            }
+
            G::header('Location: ' . $urlLogin);
            exit(0);
        }