Merged in bugfix/HOR-3670-MN4 (pull request #5945)

HOR-3670-MN4

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Marco Antonio Nina Mena
2017-08-14 21:03:35 +00:00
committed by Julio Cesar Laura Avendaño
87 changed files with 637 additions and 521 deletions

View File

@@ -28,6 +28,7 @@
//
// License: LGPL, see LICENSE
////////////////////////////////////////////////////
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Util\ElementTranslation;
@@ -242,7 +243,7 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
$aContext = \Bootstrap::getDefaultContextLog();
$con = Propel::getConnection( $DBConnectionUID );
$con->begin();
$blackList = PmSystem::getQueryBlackList();
$blackList = System::getQueryBlackList();
$aListQueries = explode('|', $blackList['queries']);
$aListAllTables = explode(
'|',
@@ -903,7 +904,7 @@ function WSProcessList ()
//private function to get current email configuration
function getEmailConfiguration ()
{
return PmSystem::getEmailConfiguration();
return System::getEmailConfiguration();
}
/**