fix: PagePicker parent handling when same as start model (#7646)

fix: PagePicker parent handling when same as start model #7624

Prevents the parent option from being used in PagePicker if it is the same as the start/top-most model. Adds a test to verify correct behavior when query and parent refer to the same page.

Author: afbora

src/Cms/PagePicker.php

@@ -130,7 +130,12 @@ public function items(): Pages|null
 		// when subpage navigation is enabled, a parent
 		// might be passed in addition to the query.
 		// The parent then takes priority.
-		} elseif ($this->options['subpages'] === true && empty($this->options['parent']) === false) {
+		// Don't use the parent if it's the same as the start/top-most model.
+		} elseif (
+			$this->options['subpages'] === true &&
+			empty($this->options['parent']) === false &&
+			$this->model()->id() !== $this->start()->id()
+		) {
 			$items = $this->itemsForParent();
 
 		// search by query

tests/Cms/Page/PagePickerTest.php

@@ -22,9 +22,9 @@ public function setUp(): void
 							[
 								'slug' => 'mother',
 								'children' => [
-									['slug' => 'child-a'],
-									['slug' => 'child-b'],
-									['slug' => 'child-c']
+									['slug' => 'child-a', 'template' => 'child-a'],
+									['slug' => 'child-b', 'template' => 'child-b'],
+									['slug' => 'child-c', 'template' => 'child-c']
 								]
 							]
 						]
@@ -97,4 +97,16 @@ public function testQueryStart(): void
 
 		$this->assertSame('grandmother', $picker->start()->id());
 	}
+
+	public function testSameQueryAndParent(): void
+	{
+		$picker = new PagePicker([
+			'query'  => 'site.find("grandmother/mother").children.filterBy("intendedTemplate", "in", ["child-a", "child-c"])',
+			'parent' => 'grandmother/mother'
+		]);
+
+		$this->assertCount(2, $picker->items());
+		$this->assertSame('grandmother/mother/child-a', $picker->items()->first()->id());
+		$this->assertSame('grandmother/mother/child-c', $picker->items()->last()->id());
+	}
 }