Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions Classes/ViewHelpers/FormViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Flow\Http\BaseUriProvider;
use Neos\Flow\Mvc\ActionRequest;
use Neos\FluidAdaptor\ViewHelpers\FormViewHelper as FluidFormViewHelper;
use Neos\Form\Core\Runtime\FormRuntime;
Expand All @@ -21,6 +23,13 @@
*/
class FormViewHelper extends FluidFormViewHelper
{

/**
* @Flow\Inject
* @var BaseUriProvider
*/
protected $baseUriProvider;

/**
* Renders hidden form fields for referrer information about
* the current request.
Expand Down Expand Up @@ -58,11 +67,12 @@ protected function getFormObjectName()
protected function getFormActionUri()
{
/** @var ActionRequest $actionRequest */
$actionRequest = $this->controllerContext->getRequest();
$uri = $actionRequest->getHttpRequest()->getUri();
if ($this->hasArgument('section') && $this->arguments['section'] !== '') {
$uri = $uri->withFragment($this->arguments['section']);
}
$httpRequest = $this->controllerContext->getRequest()->getHttpRequest();
$requestUri = $httpRequest->getUri();
$uri = $this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest($httpRequest)
->withPath($requestUri->getPath())
->withQuery($requestUri->getQuery())
->withFragment($this->hasArgument('section') ? $this->arguments['section'] : $requestUri->getFragment());
return (string)$uri;
}
}