Merge pull request #3900 from caswell-wc/request-from-filters

MGatner · web-flow · commit 819480a6fa2d · 2021-01-18T11:30:42.000-05:00
Handling requests sent back from filters
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -407,6 +407,11 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 			{
 				return $returnResponse ? $possibleResponse : $possibleResponse->pretend($this->useSafeOutput)->send();
 			}
+
+			if ($possibleResponse instanceof Request)
+			{
+				$this->request = $possibleResponse;
+			}
 		}
 
 		$returned = $this->startController();

Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,11 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache`
`407`	`407`	`{`
`408`	`408`	`return $returnResponse ? $possibleResponse : $possibleResponse->pretend($this->useSafeOutput)->send();`
`409`	`409`	`}`
	`410`	`+`
	`411`	`+ if ($possibleResponse instanceof Request)`
	`412`	`+ {`
	`413`	`+ $this->request = $possibleResponse;`
	`414`	`+ }`
`410`	`415`	`}`
`411`	`416`
`412`	`417`	`$returned = $this->startController();`