Merged in bugfix/HOR-4128 (pull request #6202)

HOR-4128

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-11-30 18:09:37 +00:00
committed by Julio Cesar Laura Avendaño

View File

@@ -106,7 +106,10 @@ class AddonsStore extends BaseAddonsStore
$sw = 1;
if ($type == 'plugin') {
$addonInLicense = in_array($addon->getAddonId(), $licenseManager->features);
$addonInLicense = false;
if (!empty($addon->getAddonId()) && !empty($licenseManager->features)) {
$addonInLicense = in_array($addon->getAddonId(), $licenseManager->features);
}
if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) {
$sw = 0;
@@ -211,7 +214,11 @@ class AddonsStore extends BaseAddonsStore
}
$sw = 1;
$addonInLicense = in_array($addon->getAddonId(), $licenseManager->features);
$addonInLicense = false;
if (!empty($addon->getAddonId()) && !empty($licenseManager->features)) {
$addonInLicense = in_array($addon->getAddonId(), $licenseManager->features);
}
if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) {
$sw = 0;