tonyair/silverstripe-multiform
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-multiform synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Always fall back to creating a new step (in case the session or request data is invalid)

Browse Source
This commit is contained in:
Ingo Schommer 2011-07-19 09:51:04 +02:00
parent 24b768ecfe
commit 32d56ade02
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/MultiForm.php
View File

@ -186,18 +186,22 @@ abstract class MultiForm extends Form {
if(!isset($startStepClass)) user_error('MultiForm::init(): Please define a $startStep on ' . $this->class, E_USER_ERROR); if(!isset($startStepClass)) user_error('MultiForm::init(): Please define a $startStep on ' . $this->class, E_USER_ERROR);
// Determine whether we use the current step, or create one if it doesn't exist // Determine whether we use the current step, or create one if it doesn't exist
$currentStep = null;
if(isset($_GET['StepID'])) { if(isset($_GET['StepID'])) {
$stepID = (int)$_GET['StepID']; $stepID = (int)$_GET['StepID'];
$currentStep = DataObject::get_one('MultiFormStep', "\"SessionID\" = {$this->session->ID} AND \"ID\" = {$stepID}"); $currentStep = DataObject::get_one('MultiFormStep', "\"SessionID\" = {$this->session->ID} AND \"ID\" = {$stepID}");
} elseif($this->session->CurrentStepID) { } elseif($this->session->CurrentStepID) {
$currentStep = $this->session->CurrentStep(); $currentStep = $this->session->CurrentStep();
} else { }
// Always fall back to creating a new step (in case the session or request data is invalid)
if(!$currentStep) {
$currentStep = new $startStepClass(); $currentStep = new $startStepClass();
$currentStep->SessionID = $this->session->ID; $currentStep->SessionID = $this->session->ID;
$currentStep->write(); $currentStep->write();
} }
$currentStep->setForm($this); if($currentStep) $currentStep->setForm($this);
return $currentStep; return $currentStep;
} }