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

Removed two of the same calls, just use one outside the if-else block instead

Browse Source
This commit is contained in:
Sean Harvey 2008-04-20 00:43:19 +00:00
parent 0d3196607a
commit b298e83a0f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/MultiForm.php
View File

@ -406,7 +406,6 @@ abstract class MultiForm extends Form {
'SessionID' => ($this->stat('url_type') == 'ID') ? $this->session->ID : $this->session->Hash, 'SessionID' => ($this->stat('url_type') == 'ID') ? $this->session->ID : $this->session->Hash,
'LinkingMode' => ($nextStep->ID == $this->getCurrentStep()->ID) ? 'current' : 'link' 'LinkingMode' => ($nextStep->ID == $this->getCurrentStep()->ID) ? 'current' : 'link'
); );
$stepsFound->push(new ArrayData($templateData));
} else { } else {
// If it's not in the DB, we use a singleton instance of it instead - this step hasn't been accessed yet // If it's not in the DB, we use a singleton instance of it instead - this step hasn't been accessed yet
$nextStep = singleton($step->getNextStep()); $nextStep = singleton($step->getNextStep());
@ -414,9 +413,9 @@ abstract class MultiForm extends Form {
'ClassName' => $nextStep->class, 'ClassName' => $nextStep->class,
'Title' => $nextStep->getTitle() 'Title' => $nextStep->getTitle()
); );
$stepsFound->push(new ArrayData($templateData));
} }
// Call back so we can recursively step through // Add the array data, and do a callback
$stepsFound->push(new ArrayData($templateData));
$this->getAllStepsRecursive($nextStep, $stepsFound); $this->getAllStepsRecursive($nextStep, $stepsFound);
} }
// Once we've reached the final step, we just return what we've collected // Once we've reached the final step, we just return what we've collected