fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-04-02 11:21:03 -04:00
parent eb35c88075 20956565f2
commit 255d5e4a34
2 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.xml
View File

@@ -136,7 +136,14 @@
</exec> </exec>
</target> </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"> <exec executable="vendor/behat/behat/bin/behat">
<arg value="--format" /> <arg value="--format" />
<arg value="junit,progress" /> <arg value="junit,progress" />

2
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

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