diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 6028c1ef5..037393fbf 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -25,6 +25,7 @@ use \ProcessMaker\Importer\XmlImporter; ini_set("max_execution_time", 0); +$affectedGroups = array(); /*----------------------------------********---------------------------------*/ if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") && diff --git a/workflow/engine/src/ProcessMaker/Importer/XmlImporter.php b/workflow/engine/src/ProcessMaker/Importer/XmlImporter.php index 61fa0a1a9..fa0418160 100644 --- a/workflow/engine/src/ProcessMaker/Importer/XmlImporter.php +++ b/workflow/engine/src/ProcessMaker/Importer/XmlImporter.php @@ -30,7 +30,8 @@ class XmlImporter extends Importer throw new \Exception(\G::LoadTranslation("ID_INVALID_FILE")); } - $this->dom->load((is_null($filename))? $this->filename : $filename); + $loadFilename = (is_null($filename))? $this->filename : $filename; + $this->dom->loadXml(file_get_contents($loadFilename)); $this->root = $this->dom->documentElement; // validate version diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index d7641d546..d3b1e01e0 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -1147,6 +1147,7 @@ importProcessExistGroup = function() url : 'processes_Import_Ajax', waitMsg : _('ID_UPLOADING_PROCESS_FILE'), waitTitle : " ", + timeout: 3600, success : function(o, resp) { var resp_ = Ext.util.JSON.decode(resp.response.responseText); var sNewProUid = resp_.sNewProUid; @@ -1327,6 +1328,7 @@ importProcessExistProcess = function() url : 'processes_Import_Ajax', waitMsg : _('ID_UPLOADING_PROCESS_FILE'), waitTitle : " ", + timeout: 3600, success: function(o, resp) { var resp_ = Ext.util.JSON.decode(resp.response.responseText); var sNewProUid = resp_.sNewProUid; @@ -1560,6 +1562,7 @@ importProcess = function() url : "processes_Import_Ajax", waitMsg : _("ID_UPLOADING_PROCESS_FILE"), waitTitle: " ", + timeout: 3600, success: function(o, resp) { var resp_ = Ext.util.JSON.decode(resp.response.responseText);