mirror of
https://github.com/e107inc/e107.git
synced 2025-08-02 20:57:26 +02:00
Merge pull request #4419 from Jimmi08/patch-20
Issue #3912 e_ROUTE for non sef-url version of pages
This commit is contained in:
9
page.php
9
page.php
@@ -20,6 +20,7 @@ if(!e_QUERY)
|
|||||||
$e107CorePage->listBooks();
|
$e107CorePage->listBooks();
|
||||||
|
|
||||||
e107::canonical('page/list/index');
|
e107::canonical('page/list/index');
|
||||||
|
e107::route('page/list/index');
|
||||||
require_once(HEADERF);
|
require_once(HEADERF);
|
||||||
|
|
||||||
e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], "cpage-full-list");
|
e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], "cpage-full-list");
|
||||||
@@ -40,6 +41,7 @@ elseif(vartrue($_GET['bk'])) // List Chapters within a specific Book
|
|||||||
$id = $e107CorePage->setRequest('listChapters');
|
$id = $e107CorePage->setRequest('listChapters');
|
||||||
$e107CorePage->listChapters($id);
|
$e107CorePage->listChapters($id);
|
||||||
e107::canonical('page/book/index', $e107CorePage->getChapterData($id));
|
e107::canonical('page/book/index', $e107CorePage->getChapterData($id));
|
||||||
|
e107::route('page/book/index');
|
||||||
|
|
||||||
require_once(HEADERF);
|
require_once(HEADERF);
|
||||||
e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], 'cpage-chapter-list');
|
e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], 'cpage-chapter-list');
|
||||||
@@ -52,6 +54,8 @@ elseif(vartrue($_GET['ch'])) // List Pages within a specific Chapter
|
|||||||
$e107CorePage->listPages($id);
|
$e107CorePage->listPages($id);
|
||||||
$chData = $e107CorePage->getChapterData($id);
|
$chData = $e107CorePage->getChapterData($id);
|
||||||
e107::canonical('page/chapter/index',$chData);
|
e107::canonical('page/chapter/index',$chData);
|
||||||
|
e107::route('page/chapter/index');
|
||||||
|
|
||||||
unset($row);
|
unset($row);
|
||||||
require_once(HEADERF);
|
require_once(HEADERF);
|
||||||
e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], 'cpage-page-list');
|
e107::getRender()->tablerender($e107CorePage->pageOutput['caption'], $e107CorePage->pageOutput['text'], 'cpage-page-list');
|
||||||
@@ -65,8 +69,11 @@ else
|
|||||||
$e107CorePage->setPage();
|
$e107CorePage->setPage();
|
||||||
|
|
||||||
$canRoute = empty($e107CorePage->page['page_chapter']) ? 'page/view/other' : 'page/view';
|
$canRoute = empty($e107CorePage->page['page_chapter']) ? 'page/view/other' : 'page/view';
|
||||||
|
$pageRoute = empty($e107CorePage->page['page_chapter']) ? 'page/view/other' : 'page/view/index';
|
||||||
|
|
||||||
e107::canonical( $canRoute, $e107CorePage->page);
|
e107::canonical( $canRoute, $e107CorePage->page);
|
||||||
|
e107::route($pageRoute);
|
||||||
|
|
||||||
require_once(HEADERF);
|
require_once(HEADERF);
|
||||||
|
|
||||||
$ns = e107::getRender();
|
$ns = e107::getRender();
|
||||||
|
Reference in New Issue
Block a user