fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in mcuiza/processmaker/PM-3366 (pull request #2723)

Browse Source 
PM-3366
This commit is contained in:
Julio Cesar Laura Avendaño
2015-09-04 14:23:06 -04:00
parent 0ba4fb8d2d 9d7a7ed7b4
commit 1ff106ed23
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.system.php
View File

@@ -1181,7 +1181,8 @@ class System
self::$debug = $config['debug']; self::$debug = $config['debug'];
if ($config['proxy_pass'] != '') { if ($config['proxy_pass'] != '') {
$config['proxy_pass'] = G::decrypt($config['proxy_pass'], 'proxy_pass'); $G = new G();
$config['proxy_pass'] = $G->decrypt($config['proxy_pass'], 'proxy_pass');
} }
return $config; return $config;

11
workflow/public_html/sysGeneric.php
View File

@@ -277,6 +277,11 @@ define( 'PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl' );
define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' ); define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' );
define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' ); define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' );
//Call Gulliver Classes
Bootstrap::LoadThirdParty("smarty/libs", "Smarty.class");
//Loading the autoloader libraries feature
Bootstrap::registerSystemClasses();
$config = Bootstrap::getSystemConfiguration(); $config = Bootstrap::getSystemConfiguration();
@@ -303,12 +308,6 @@ session_start();
//$e_all = $config['debug'] ? $e_all : $e_all & ~ E_NOTICE; //$e_all = $config['debug'] ? $e_all : $e_all & ~ E_NOTICE;
//$e_all = E_ALL & ~ E_DEPRECATED & ~ E_STRICT & ~ E_NOTICE & ~E_WARNING; //$e_all = E_ALL & ~ E_DEPRECATED & ~ E_STRICT & ~ E_NOTICE & ~E_WARNING;
//Call Gulliver Classes
Bootstrap::LoadThirdParty("smarty/libs", "Smarty.class");
//Loading the autoloader libraries feature
Bootstrap::registerSystemClasses();
G::LoadSystem('inputfilter'); G::LoadSystem('inputfilter');
$filter = new InputFilter(); $filter = new InputFilter();
$config['display_errors'] = $filter->validateInput($config['display_errors']); $config['display_errors'] = $filter->validateInput($config['display_errors']);