[pull] main from nlemoine:main

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-	".": "1.0.0"
+	".": "1.0.1"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.0.1](https://github.com/nlemoine/page-for-custom-post-type/compare/1.0.0...1.0.1) (2026-05-08)
+
+
+### Bug Fixes
+
+* drop stale page mapping when CPT becomes ineligible ([021857b](https://github.com/nlemoine/page-for-custom-post-type/commit/021857ba309ca305a3c1ffac0ee420d50a9d5c56)), closes [#12](https://github.com/nlemoine/page-for-custom-post-type/issues/12)
+
 ## [1.0.0](https://github.com/nlemoine/page-for-custom-post-type/compare/0.5.0...1.0.0) (2026-05-08)
 
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "page-for-custom-post-type",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"private": true,
 	"description": "Editor scripts for the Page for custom post type WordPress plugin",
 	"packageManager": "pnpm@10.33.0",

plugin.php

@@ -5,7 +5,7 @@
  * Plugin URI: https://github.com/nlemoine/page-for-custom-post-type
  * Description: Allows you to set pages for any custom post type archive
  * x-release-please-start-version
- * Version: 1.0.0
+ * Version: 1.0.1
  * x-release-please-end
  * Author: Nicolas Lemoine
  * Author URI: https://n5s.dev/

src/Frontend/Handler.php

@@ -5,6 +5,7 @@
 namespace n5s\PageForCustomPostType\Frontend;
 
 use n5s\PageForCustomPostType\Core\Api;
+use WP_Post_Type;
 use WP_Query;
 
 /**
@@ -54,6 +55,15 @@ public function withQueryProperties(WP_Query $query): void
             return;
         }
 
+        // Defensive fallback: if the CPT is not registered at all this request
+        // (e.g. the plugin that registers it is deactivated), no
+        // registered_post_type hook fires, so the cleanup in LifecycleManager
+        // can't delete the stale option. Bail here to avoid hijacking the page.
+        $postTypeObject = get_post_type_object($postType);
+        if (!$postTypeObject instanceof WP_Post_Type || !$this->api->shouldConsiderPostType($postTypeObject)) {
+            return;
+        }
+
         // Modify query conditionals
         $query->is_singular = false;
         $query->is_page = false;

src/Lifecycle/LifecycleManager.php

@@ -30,6 +30,12 @@ public function __construct(
     public function watchOptions(string $postType, WP_Post_Type $postTypeObject): void
     {
         if (!$this->api->shouldConsiderPostType($postTypeObject)) {
+            // The mapping outlives CPT arg changes; drop it when the type is no
+            // longer eligible so frontend/admin don't operate on stale state.
+            if ($this->api->getPageIdFromPostType($postType, false) !== null) {
+                $this->deleteOption($postType);
+            }
+
             return;
         }
 
@@ -213,7 +219,7 @@ private function onOptionChange(string $name, mixed $value): void
         $pageIds = (array) get_option(Api::OPTION_PAGE_IDS, []);
         $pageIds[$postType] = $value;
 
-        update_option(Api::OPTION_PAGE_IDS, array_filter($pageIds));
+        update_option(Api::OPTION_PAGE_IDS, array_filter($pageIds), true);
 
         $this->rewriteManager->flushRewriteRules($postType);
     }

src/Lifecycle/Migrator.php

@@ -16,7 +16,7 @@ final class Migrator
 {
     private const DB_VERSION_OPTION = 'pfcpt_db_version';
     // x-release-please-start-version
-    private const CURRENT_VERSION = '1.0.0';
+    private const CURRENT_VERSION = '1.0.1';
     // x-release-please-end
 
     public function migrate(): void

tests/Integration/EdgeCaseTest.php

@@ -143,4 +143,47 @@ public function testQueriedObjectIsPageNotPosts(): void
         $this->assertSame('page', $queriedObject->post_type);
         $this->assertEquals($this->homeForBookId, $queriedObject->ID);
     }
+
+    public function testUnregisteredCptDoesNotHijackQuery(): void
+    {
+        $bookHomeUrl = $this->getBookHomeUrl();
+
+        unregister_post_type(self::BOOK_POST_TYPE);
+
+        flush_rewrite_rules();
+
+        $this->get($bookHomeUrl);
+
+        global $wp_query;
+
+        $this->assertTrue($wp_query->is_page);
+        $this->assertFalse($wp_query->is_home);
+        $this->assertFalse(\n5s\PageForCustomPostType\is_page_for_custom_post_type());
+    }
+
+    public function testNonEligibleCptDeletesMappingOnRegistration(): void
+    {
+        $bookHomeUrl = $this->getBookHomeUrl();
+
+        $this->assertNotFalse(get_option('page_for_' . self::BOOK_POST_TYPE));
+
+        unregister_post_type(self::BOOK_POST_TYPE);
+        register_post_type(self::BOOK_POST_TYPE, [
+            'public' => false,
+            'publicly_queryable' => false,
+            'label' => 'Books',
+        ]);
+
+        $this->assertFalse(get_option('page_for_' . self::BOOK_POST_TYPE));
+
+        flush_rewrite_rules();
+
+        $this->get($bookHomeUrl);
+
+        global $wp_query;
+
+        $this->assertTrue($wp_query->is_page);
+        $this->assertFalse($wp_query->is_home);
+        $this->assertFalse(\n5s\PageForCustomPostType\is_page_for_custom_post_type());
+    }
 }