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

Merged in victorsl/processmaker/HOR-1318-31 (pull request #4421)

Browse Source 
HOR-1318
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-28 18:18:27 -04:00
parent e953185116 c0614e8485
commit 9e95b10463
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,7 @@ class System
'error_reporting' => "", 'error_reporting' => "",
'display_errors' => 'On', 'display_errors' => 'On',
'system_utc_time_zone' => 0, 'system_utc_time_zone' => 0,
'server_protocol' => '',
'server_hostname_requests_frontend' => '' 'server_hostname_requests_frontend' => ''
); );
@@ -1265,11 +1266,14 @@ class System
try { try {
$arraySystemConfiguration = self::getSystemConfiguration(); $arraySystemConfiguration = self::getSystemConfiguration();
$serverProtocol = $arraySystemConfiguration['server_protocol'];
$serverProtocol = ($serverProtocol != '')? $serverProtocol : ((G::is_https())? 'https' : 'http');
$serverHostname = $arraySystemConfiguration['server_hostname_requests_frontend']; $serverHostname = $arraySystemConfiguration['server_hostname_requests_frontend'];
$serverHostname = ($serverHostname != '')? $serverHostname : $_SERVER['HTTP_HOST']; $serverHostname = ($serverHostname != '')? $serverHostname : $_SERVER['HTTP_HOST'];
//Return //Return
return ((G::is_https())? 'https://' : 'http://') . $serverHostname; return $serverProtocol . '://' . $serverHostname;
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
} }