diff --git a/src/WpStarter/Wordpress/Application.php b/src/WpStarter/Wordpress/Application.php index ec0214a..87f5481 100644 --- a/src/WpStarter/Wordpress/Application.php +++ b/src/WpStarter/Wordpress/Application.php @@ -11,7 +11,7 @@ class Application extends \WpStarter\Foundation\Application * * @var string */ - const VERSION = '1.9.2'; + const VERSION = '1.9.3'; protected $bootstrappedList = []; diff --git a/src/WpStarter/Wordpress/Kernel.php b/src/WpStarter/Wordpress/Kernel.php index 464faa8..89f0fc3 100644 --- a/src/WpStarter/Wordpress/Kernel.php +++ b/src/WpStarter/Wordpress/Kernel.php @@ -4,8 +4,10 @@ use WpStarter\Contracts\Foundation\Application; use WpStarter\Foundation\Http\Kernel as HttpKernel; +use WpStarter\Http\Request; use WpStarter\Routing\Pipeline; use WpStarter\Routing\Router; +use WpStarter\Support\Facades\Facade; use WpStarter\Wordpress\Routing\Router as ShortcodeRouter; class Kernel extends HttpKernel @@ -89,7 +91,7 @@ function registerWpHandler($request) $hook=(array)$this->wpHandleHook; add_action($hook[0]??'template_redirect', function ()use($request) { if($request->isNotFoundHttpExceptionFromRoute()) { - $this->handleWp($request, true); + $this->handleWp(Request::capture(), true); } }, $hook[1]??1); } @@ -126,6 +128,10 @@ function handleWp($request, $processResponse=false) */ protected function wpSendRequestThroughRouter($request) { + $this->app->instance('request', $request); + + Facade::clearResolvedInstance('request'); + return (new Pipeline($this->app)) ->send($request) ->through($this->app->shouldSkipMiddleware() ? [] : $this->middleware)