Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629

This commit is contained in:
Ronald Quenta
2017-08-10 18:33:14 -04:00
68 changed files with 818 additions and 760 deletions

View File

@@ -303,7 +303,6 @@ try {
}
//Save files
//require_once ("classes/model/AppDocument.php");
if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
$oInputDocument = new \ProcessMaker\BusinessModel\Cases\InputDocument();

View File

@@ -130,8 +130,6 @@ if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
}
if ($indocUid != null) {
//require_once ("classes/model/AppFolder.php");
//require_once ("classes/model/InputDocument.php");
$oInputDocument = new InputDocument();
$aID = $oInputDocument->load( $indocUid );

View File

@@ -328,7 +328,7 @@ try {
* Added By erik 16-05-08
* Description: this was added for the additional database connections
*/
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
$oDbConnections->loadAdditionalConnections();
$_SESSION['CURRENT_DYN_UID'] = $_GET['UID'];
@@ -1137,7 +1137,7 @@ try {
* Description: this was added for the additional database connections
*/
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
$oDbConnections->loadAdditionalConnections();
$stepFilename = "$sNamespace/$sStepName";
G::evalJScript( "

View File

@@ -139,7 +139,7 @@ if (! isset( $_GET['ex'] )) {
$_GET['ex'] = $_GET['position'];
}
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
$oDbConnections->loadAdditionalConnections();
$G_PUBLISH = new Publisher();

View File

@@ -75,7 +75,7 @@ try {
}
if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {
$_SESSION['PROCESS'] = $applicationFields['PRO_UID'];
$dbConnections = new dbConnections( $_SESSION['PROCESS'] );
$dbConnections = new DbConnections( $_SESSION['PROCESS'] );
$dbConnections->loadAdditionalConnections();
$_SESSION['CURRENT_DYN_UID'] = $_REQUEST['DYN_UID'];