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();