Merge branch 'master' of bitbucket.org:colosa/processmaker

build.xml

@@ -136,7 +136,14 @@
   </exec>
  </target>
 
- <target name="behat" description="Behaviour tests with Behat">
+ <target name="prepare-behat" description="Prepare Behat Env.">
+   <exec executable="${basedir}/../prepare_behat_env">
+     <arg value="--source-dir" />
+     <arg value="${basedir}/../" />
+   </exec>
+ </target>
+
+ <target name="behat" description="Behaviour tests with Behat" depends="prepare-behat">
   <exec executable="vendor/behat/behat/bin/behat">
    <arg value="--format" />
    <arg value="junit,progress" />

workflow/engine/methods/processes/processes_Import_Ajax.php

@@ -23,6 +23,7 @@
  */
 ini_set( 'max_execution_time', '0' );
 
+if (isset($_FILES["PROCESS_FILENAME"])) {
     $ext = pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION);
 
     if ($ext == "pmx") {
@@ -57,6 +58,7 @@ if ($ext == "pmx") {
         echo json_encode($result);
         exit(0);
     }
+}
 
 function reservedWordsSqlValidate ($data)
 {