Fixed issue that could cause validate() to receive values of previous visit to tab when current form is saved.

shannah · shannah · commit a326af2acfd0 · 2020-09-07T09:29:23.000-07:00
diff --git a/Dataface/FormTool.php b/Dataface/FormTool.php
@@ -1225,7 +1225,7 @@ function validateRecordForm($record, &$form, $new=false, $tab=null){
         }
         foreach ($tabforms as $tabname=>$currForm) {
 			$currForm->_flagSubmitted = true;
-			if ( !$currForm->validate($submittedValues) ){
+			if ( !$currForm->validate(($currForm === $form) ? null : $submittedValues) ){
                 if ($currForm !== $form) {
                     $errorMessage = df_translate('classes.FormTool.errors.ERROR_IN_TAB', 'A validation error occurred in the '.$tabs[$tabname]['label'].' tab.  Please verify that this tab\'s input is correct before saving.', array('tab'=>$tabs[$tabname]['label']));
                     foreach ($currForm->_errors as $error) {

Original file line number	Diff line number	Diff line change
`@@ -1225,7 +1225,7 @@ function validateRecordForm($record, &$form, $new=false, $tab=null){`
`1225`	`1225`	`}`
`1226`	`1226`	`foreach ($tabforms as $tabname=>$currForm) {`
`1227`	`1227`	`$currForm->_flagSubmitted = true;`
`1228`		`- if ( !$currForm->validate($submittedValues) ){`
	`1228`	`+ if ( !$currForm->validate(($currForm === $form) ? null : $submittedValues) ){`
`1229`	`1229`	`if ($currForm !== $form) {`
`1230`	`1230`	`$errorMessage = df_translate('classes.FormTool.errors.ERROR_IN_TAB', 'A validation error occurred in the '.$tabs[$tabname]['label'].' tab. Please verify that this tab\'s input is correct before saving.', array('tab'=>$tabs[$tabname]['label']));`
`1231`	`1231`	`foreach ($currForm->_errors as $error) {`