From 2613e8ba05d32508e3003d2d318352ed8433403a Mon Sep 17 00:00:00 2001
From: Freddy Daniel Rojas Valda <daniel.rojas@colosa.com>
Date: Wed, 4 Feb 2015 12:38:08 -0400
Subject: [PATCH] PM-1442 "Revisar el endpoint de los dependientes y verificar
 si existe el reemplazo de variables para los queries, si no existe
 implementarlo" SOLVED

---
 .../src/ProcessMaker/BusinessModel/Variable.php       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 workflow/engine/src/ProcessMaker/BusinessModel/Variable.php

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
old mode 100644
new mode 100755
index f73506687..f015af7f8
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
@@ -1,6 +1,8 @@
 <?php
 namespace ProcessMaker\BusinessModel;
 
+use \G;
+
 class Variable
 {
     /**
@@ -487,7 +489,7 @@ class Variable
                 $variableDbConnectionUid = $row["VAR_DBCONNECTION"];
                 $variableSql = $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(strtolower("VAR_NAME"), $variableName)));
             }
 
             //Verify data
@@ -499,7 +501,9 @@ class Variable
             $cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow");
             $stmt = $cnn->createStatement();
 
-            $rs = $stmt->executeQuery(\G::replaceDataField($variableSql, $arrayVariable), \ResultSet::FETCHMODE_NUM);
+            $replaceFields = G::replaceDataField($variableSql, $arrayVariable);
+
+            $rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM);
 
             while ($rs->next()) {
                 $row = $rs->getRow();
@@ -661,8 +665,9 @@ class Variable
 
             $cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow");
             $stmt = $cnn->createStatement();
+            $replaceFields = G::replaceDataField($sqlQuery, $arrayVariable);
 
-            $rs = $stmt->executeQuery(\G::replaceDataField($sqlQuery, $arrayVariable), \ResultSet::FETCHMODE_NUM);
+            $rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM);
 
             while ($rs->next()) {
                 $row = $rs->getRow();