diff --git a/.gitignore b/.gitignore index 386575c86..d3b8c6f02 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ nbproject workflow/engine/config/paths_installed.php gulliver/thirdparty/html2ps_pdf/cache +workflow/engine/content/languages/translations.environments *~ workflow/engine/js/labels/ workflow/public_html/files/ diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index e4de0216c..53c2a2e18 100644 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -418,7 +418,7 @@ class Form extends XmlForm } } } - else{ + /* else{ if ($v->type == 'checkbox') { $values[$k]=$v->falseValue; } @@ -427,7 +427,7 @@ class Form extends XmlForm $values[$k] = null; } } - } + }*/ } else { if (isset($_FILES['form']['name'][$k])) { diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index 2dbb046f7..0d7f4a58c 100644 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -546,6 +546,7 @@ switch($_POST['action']) { $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#'; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;'; $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID']; + if(!isset($_SESSION['CURRENT_DYN_UID'])) $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID']; $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); G::RenderPage('publish', 'raw'); break;