Conflictos arreglados

2015-02-12 16:37:06 -04:00
parent 3471373a16 9fae869242
commit 9daede1a50
20 changed files with 408 additions and 269 deletions
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -373,8 +373,12 @@ class Configurations // extends Configuration
     */
    public function getFormats()
    {
-    	$this->UserConfig = $this->getConfiguration("ENVIRONMENT_SETTINGS", "");
-
+        if (!isset($this->UserConfig)) {
+            $this->UserConfig = array();
+        }
+        if (empty($this->UserConfig)) {
+            $this->UserConfig = $this->getConfiguration("ENVIRONMENT_SETTINGS", "");
+        }
        if (is_numeric($this->UserConfig)) {
            $this->UserConfig = array();
        }