⚡ instead of route:before use render:after hook

Signed-off-by: bnomei <[email protected]>
bnomei · Sep 18, 2023 · a455de9 · a455de9
1 parent 94f19b1
commit a455de9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "type": "kirby-plugin",
   "description": "Setup performant HTTP Status Code Redirects from within the Kirby Panel",
   "homepage": "https://github.com/bnomei/kirby3-redirects",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "license": "MIT",
   "authors": [
     {

diff --git a/index.php b/index.php
@@ -17,12 +17,14 @@
         'plugin-redirects3xx' => __DIR__ . '/blueprints/sections/redirects3xx.yml',
     ],
     'hooks' => [
-        'route:before' => function () {
-            $isPanel = str_contains(kirby()->request()->url()->toString(), kirby()->urls()->panel());
-            $isApi = str_contains(kirby()->request()->url()->toString(), kirby()->urls()->api());
-            $isMedia = str_contains(kirby()->request()->url()->toString(), kirby()->urls()->media());
-            if (!$isPanel && !$isApi && !$isMedia) {
-                \Bnomei\Redirects::singleton()->redirect();
+        'page.render:before' => function (string $contentType, array $data, Kirby\Cms\Page $page) {
+            if ($page->isErrorPage()) {
+                $isPanel = str_contains(kirby()->request()->url()->toString(), kirby()->urls()->panel());
+                $isApi = str_contains(kirby()->request()->url()->toString(), kirby()->urls()->api());
+                $isMedia = str_contains(kirby()->request()->url()->toString(), kirby()->urls()->media());
+                if (!$isPanel && !$isApi && !$isMedia) {
+                    \Bnomei\Redirects::singleton()->redirect();
+                }
             }
         },
         'page.update:after' => function (Kirby\Cms\Page $newPage, Kirby\Cms\Page $oldPage) {

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby3-redirects',
-        'pretty_version' => '1.11.0',
-        'version' => '1.11.0.0',
+        'pretty_version' => '1.12.0',
+        'version' => '1.12.0.0',
         'reference' => NULL,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby3-redirects' => array(
-            'pretty_version' => '1.11.0',
-            'version' => '1.11.0.0',
+            'pretty_version' => '1.12.0',
+            'version' => '1.12.0.0',
             'reference' => NULL,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',