Skip to content

Commit 70f1e57

Browse files
authored
Remove IncomingRequest dependency
1 parent eccbfc0 commit 70f1e57

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

system/CodeIgniter.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
use Closure;
4141
use CodeIgniter\Filters\Exceptions\FilterException;
4242
use CodeIgniter\HTTP\DownloadResponse;
43-
use CodeIgniter\HTTP\IncomingRequest;
4443
use CodeIgniter\HTTP\RedirectResponse;
4544
use CodeIgniter\HTTP\Request;
4645
use CodeIgniter\HTTP\ResponseInterface;
@@ -969,8 +968,13 @@ protected function gatherOutput($cacheConfig = null, $returned = null)
969968
*/
970969
public function storePreviousURL($uri)
971970
{
972-
// Only valid for some requests
973-
if (! $this->request instanceof IncomingRequest || $this->request->isCLI() || $this->request->isAJAX())
971+
// Ignore CLI requests
972+
if (method_exists($this->request, 'isCLI') && $this->request->isCLI())
973+
{
974+
return;
975+
}
976+
// Ignore AJAX requests
977+
if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX())
974978
{
975979
return;
976980
}

0 commit comments

Comments
 (0)