From 1c8441129d0f8c0ac413e1d30b0611020fd13408 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 6 Mar 2015 12:29:16 -0400 Subject: [PATCH] IMPROVEMENT --- workflow/engine/classes/class.pmDynaform.php | 2 +- workflow/engine/src/ProcessMaker/BusinessModel/Variable.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 64a56f04d..f72fa80b0 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -114,7 +114,7 @@ class pmDynaform if ($json->dbConnection !== "none" && $json->sql !== "") { $cnn = Propel::getConnection($json->dbConnection); $stmt = $cnn->createStatement(); - $rs = $stmt->executeQuery(\G::replaceDataField($json->sql, array()), \ResultSet::FETCHMODE_NUM); + $rs = $stmt->executeQuery(strtoupper($json->sql), \ResultSet::FETCHMODE_NUM); while ($rs->next()) { $row = $rs->getRow(); $option = array( diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php index f015af7f8..de93efc6d 100755 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php @@ -487,9 +487,9 @@ class Variable $row = $rsCriteria->getRow(); $variableDbConnectionUid = $row["VAR_DBCONNECTION"]; - $variableSql = $row["VAR_SQL"]; + $variableSql = strtoupper($row["VAR_SQL"]); } else { - throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array(strtolower("VAR_NAME"), $variableName))); + throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array("VAR_NAME", $variableName))); } //Verify data