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

HOR-3610

Browse Source 
Fix System class conflict.
This commit is contained in:
davidcallizaya
2017-08-03 18:44:57 -04:00
parent f0c2511968
commit 81149399da
362 changed files with 1843 additions and 127409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/triggers/class.pmTrZimbra.php
View File

@@ -402,7 +402,7 @@ function uploadZimbraFile($ServerUrl, $username, $preAuthKey, $folderName, $file
curl_setopt ($ch, CURLOPT_HTTPHEADER,$header_array);
//Apply proxy settings
$sysConf = System::getSystemConfiguration();
$sysConf = PMSystem::getSystemConfiguration();
if ($sysConf['proxy_host'] != '') {
curl_setopt($ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
if ($sysConf['proxy_port'] != '') {