From 453d6f4fb2840b9c184024d2fba8d3a779f0f509 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Fri, 7 Jan 2011 23:26:57 +0000 Subject: [PATCH] Various settings for compatibility with MSSQL --- workflow/engine/classes/class.reportTables.php | 2 +- workflow/engine/templates/cases/cases_StepsTree.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php index 7486be1e3..4a357c991 100644 --- a/workflow/engine/classes/class.reportTables.php +++ b/workflow/engine/classes/class.reportTables.php @@ -647,7 +647,7 @@ class ReportTables if (!isset($aFields[$aField['sFieldName']])) { $aFields[$aField['sFieldName']] = ''; } - $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? mssql_real_escape_string($aFields[$aField['sFieldName']]) : '') . "',"; + $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? mysql_real_escape_string($aFields[$aField['sFieldName']]) : '') . "',"; break; case 'date': $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']] : '') . "',"; diff --git a/workflow/engine/templates/cases/cases_StepsTree.php b/workflow/engine/templates/cases/cases_StepsTree.php index 777d4b8c9..0a1ccba44 100644 --- a/workflow/engine/templates/cases/cases_StepsTree.php +++ b/workflow/engine/templates/cases/cases_StepsTree.php @@ -54,10 +54,10 @@ $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); $oPMScript = new PMScript(); $oPMScript->setFields($Fields['APP_DATA'] ); - foreach ( $rs as $key => $aRow ) + foreach ( $rs as $key => $aRow ) { $bAccessStep = false; - if ($aRow->getStepCondition() != '') { + if (trim($aRow->getStepCondition()) != '') { $oPMScript->setScript( $aRow->getStepCondition() ); $bAccessStep = $oPMScript->evaluate(); }