Skip to content
Snippets Groups Projects
Unverified Commit ed5384ac authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3233047 by daffie, dww, longwave, Kristen Pol:...

Issue #3233047 by daffie, dww, longwave, Kristen Pol: Drupal\Core\Routing\RequestContext::fromRequest() should be returning $this
parent 76b1a8ba
No related branches found
No related tags found
13 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!1896Issue #2940605: Can only intentionally re-render an entity with references 20 times,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!512Issue #3207771: Menu UI node type form documentation points to non-existent function,!485Sets the autocomplete attribute for username/password input field on login form.,!449Issue #2784233: Allow multiple vocabularies in the taxonomy filter,!231Issue #2671162: summary text wysiwyg patch working fine on 9.2.0-dev,!43Resolve #3173180: Add UI for 'loading' html attribute to images,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
...@@ -39,6 +39,8 @@ public function fromRequest(Request $request) { ...@@ -39,6 +39,8 @@ public function fromRequest(Request $request) {
if (isset($GLOBALS['base_url'])) { if (isset($GLOBALS['base_url'])) {
$this->setCompleteBaseUrl($GLOBALS['base_url']); $this->setCompleteBaseUrl($GLOBALS['base_url']);
} }
return $this;
} }
/** /**
......
...@@ -35,9 +35,7 @@ public function __construct(CurrentPathStack $current_path) { ...@@ -35,9 +35,7 @@ public function __construct(CurrentPathStack $current_path) {
public function finalMatch(RouteCollection $collection, Request $request) { public function finalMatch(RouteCollection $collection, Request $request) {
$this->routes = $collection; $this->routes = $collection;
$context = new RequestContext(); $context = (new RequestContext())->fromRequest($request)->setContext($context);
$context->fromRequest($request);
$this->setContext($context);
return $this->match($this->currentPath->getPath($request)); return $this->match($this->currentPath->getPath($request));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment