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

8
workflow/engine/classes/class.wsBase.php
View File

@@ -290,7 +290,7 @@ class wsBase
try {
$solrEnabled = 0;
if (($solrEnv = System::solrEnv()) !== false) {
if (($solrEnv = PMSystem::solrEnv()) !== false) {
$appSolr = new AppSolr(
$solrEnv["solr_enabled"],
@@ -893,7 +893,7 @@ class wsBase
}
}
$aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : System::getEmailConfiguration();
$aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : PMSystem::getEmailConfiguration();
if (!isset($aSetup['MESS_ENABLED'])) {
$aSetup['MESS_ENABLED'] = 1;
@@ -902,7 +902,7 @@ class wsBase
}
} else {
/*----------------------------------********---------------------------------*/
$aSetup = System::getEmailConfiguration();
$aSetup = PMSystem::getEmailConfiguration();
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
@@ -2846,7 +2846,7 @@ class wsBase
$result->status_code = 0;
$result->message = G::loadTranslation( 'ID_SUCESSFUL' );
$result->timestamp = date( 'Y-m-d H:i:s' );
$result->version = System::getVersion();
$result->version = PMSystem::getVersion();
$result->operatingSystem = $redhat;
$result->webServer = getenv( 'SERVER_SOFTWARE' );
$result->serverName = getenv( 'SERVER_NAME' );