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

4
workflow/engine/classes/model/AddonsManager.php
View File

@@ -163,7 +163,7 @@ class AddonsManager extends BaseAddonsManager
public function getInstalledVersion()
{
if ($this->isCore()) {
return (EnterpriseUtils::pmVersion(System::getVersion()));
return (EnterpriseUtils::pmVersion(PMSystem::getVersion()));
} else {
if ($this->isPlugin()) {
if (!$this->isInstalled()) {
@@ -251,7 +251,7 @@ class AddonsManager extends BaseAddonsManager
);
// Proxy settings
$sysConf = System::getSystemConfiguration();
$sysConf = PMSystem::getSystemConfiguration();
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {
$option['http'] = array();

4
workflow/engine/classes/model/AddonsStore.php
View File

@@ -494,7 +494,7 @@ class AddonsStore extends BaseAddonsStore
"header" => "Content-type: application/x-www-form-urlencoded\r\n",
"content" => http_build_query(
array(
"pmVersion" => System::getVersion(),
"pmVersion" => PMSystem::getVersion(),
"version" => STORE_VERSION
)
)
@@ -502,7 +502,7 @@ class AddonsStore extends BaseAddonsStore
);
// Proxy settings
$sysConf = System::getSystemConfiguration();
$sysConf = PMSystem::getSystemConfiguration();
if (isset($sysConf['proxy_host'])) {
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {

2
workflow/engine/classes/model/AppNotes.php
View File

@@ -148,7 +148,7 @@ class AppNotes extends BaseAppNotes
{
try {
$aConfiguration = System::getEmailConfiguration();
$aConfiguration = PMSystem::getEmailConfiguration();
$msgError = "";
if (! isset( $aConfiguration['MESS_ENABLED'] ) || $aConfiguration['MESS_ENABLED'] != '1') {

2
workflow/engine/classes/model/Language.php
View File

@@ -355,7 +355,7 @@ class Language extends BaseLanguage
$sLanguage = $langRecord['LAN_NAME'];
//setting headers
$poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . System::getVersion() );
$poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . PMSystem::getVersion() );
$poFile->addHeader( 'POT-Creation-Date', '' );
$poFile->addHeader( 'PO-Revision-Date', date( 'Y-m-d H:i:s' ) );
$poFile->addHeader( 'Last-Translator', '' );