From 671171d8ebd39548f1d28841aab643e29c7dad53 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 19 Jan 2021 15:00:08 -0800
Subject: [PATCH] Issue #4352 Fix for non-chapter pages and chapter url.

---
 page.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/page.php b/page.php
index 19af2b0e3..35a1784ce 100644
--- a/page.php
+++ b/page.php
@@ -50,7 +50,9 @@ elseif(vartrue($_GET['ch'])) // List Pages within a specific Chapter
 {
 	$id = $e107CorePage->setRequest('listPages');
     $e107CorePage->listPages($id);
-    e107::canonical('page/chapter/index', $e107CorePage->getChapterData($id));
+    $chData = $e107CorePage->getChapterData($id);
+    var_dump($chData);
+    e107::canonical('page/chapter/index',$chData);
 	unset($row);
 	require_once(HEADERF);
     e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], 'cpage-page-list');
@@ -63,7 +65,9 @@ else
 	$e107CorePage->processViewPage();
     $e107CorePage->setPage();
 
-	e107::canonical('page/view',  $e107CorePage->page);
+    $canRoute = empty($e107CorePage->page['page_chapter']) ? 'page/view/other' : 'page/view';
+
+	e107::canonical( $canRoute,  $e107CorePage->page);
 	require_once(HEADERF);
 
 	$ns = e107::getRender();
@@ -209,7 +213,7 @@ class pageClass
 
 		$row = $this->chapterData[$chapter];
 
-		$row['book_sef']	        = $this->getSef($row['chapter_id']);
+		$row['book_sef']	        = $this->getSef($row['chapter_parent']);
 		$row['book_id']             = (int) $row['chapter_parent'];
 		$row['book_name'] 			= $this->getName($row['chapter_parent']);
 		$row['book_icon']			= $this->getIcon($row['chapter_parent']);