Backport of 68d374

This commit is contained in:
Daniel Hensby 2018-02-26 14:33:58 +00:00
parent 37be2b85a0
commit 1d77f6b36e
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 8 additions and 2 deletions

View File

@ -141,7 +141,13 @@ class MultiFormStep extends DataObject {
*/
public function Link() {
$form = $this->form;
return Controller::join_links($form->getDisplayLink(), "?{$form->config()->get_var}={$this->Session()->Hash}");
return Controller::join_links(
$form->getDisplayLink(),
'?' . http_build_query(array(
$form->getGetVar() => $this->Session()->Hash,
'StepID' => $this->ID,
))
);
}
/**

View File

@ -1,7 +1,7 @@
<ul class="stepIndicator current-$CurrentStep.class">
<% loop AllStepsLinear %>
<li class="$ClassName<% if LinkingMode %> $LinkingMode<% end_if %><% if FirstLast %> $FirstLast<% end_if %><% if $ExtraClasses %> $ExtraClasses<% end_if %>">
<% if LinkingMode = current %><% else %><% if ID %><a href="{$Top.URLSegment}/?${Top.GetVar}={$SessionID}&amp;StepID={$ID}"><% end_if %><% end_if %>
<% if LinkingMode = current %><% else %><% if ID %><a href="$Link"><% end_if %><% end_if %>
<% if Title %>$Title<% else %>$ClassName<% end_if %>
<% if LinkingMode = current %><% else %><% if ID %></a><% end_if %><% end_if %>
</li>