Merging fixes from 2.5 branch

2014-10-13 11:11:01 -04:00
parent 72e214cb2f
commit 6d5f3eac82
4 changed files with 62 additions and 14 deletions
--- a/workflow/engine/classes/class.licensedFeatures.php
+++ b/workflow/engine/classes/class.licensedFeatures.php
@@ -76,6 +76,9 @@ class PMLicensedFeatures

        $enable = in_array($value[0], $licenseManager->licensedfeatures);

+        if (!isset($this->featuresDetails[$value[0]]) || !is_object($this->featuresDetails[$value[0]])) {
+            $this->featuresDetails[$value[0]] = new stdclass();
+        }
        $this->featuresDetails[$value[0]]->enabled = $enable;
        return $enable;
    }