openrat-cms

commit d2efb1a339c86b93a0d1a9765d6a305c3202a7f4
parent 7f5f01465ff2643d00048826a7c5dd3bf5ac82ff
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat, 27 Feb 2021 02:10:16 +0100

Fix: Using the correct object-id for generating the page.

Diffstat:
M
modules/cms/generator/PageContext.class.php
 | 
2
+-
M
modules/cms/generator/PageGenerator.class.php
 | 
2
+-
M
modules/cms/generator/ValueGenerator.class.php
 | 
22
++++++++++------------

3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/modules/cms/generator/PageContext.class.php b/modules/cms/generator/PageContext.class.php
@@ -49,7 +49,7 @@ class PageContext extends BaseContext
 	public function getCacheKey()
 	{
 		return [
-			$this->sourceObjectId,
+			$this->objectId,
 			$this->languageId,
 			$this->modelId,
 			$this->scheme
diff --git a/modules/cms/generator/PageGenerator.class.php b/modules/cms/generator/PageGenerator.class.php
@@ -81,7 +81,7 @@ class PageGenerator extends BaseGenerator
 
 		$language->setCurrentLocale();
 
-		$page = new Page( $this->context->sourceObjectId );
+		$page = new Page( $this->context->objectId );
 		$page->load();
 
 		$template = new Template( $page->templateid );
diff --git a/modules/cms/generator/ValueGenerator.class.php b/modules/cms/generator/ValueGenerator.class.php
@@ -146,24 +146,22 @@ class ValueGenerator extends BaseGenerator
 													$newPageContext->objectId = $oid;
 													$pageGenerator = new PageGenerator( $newPageContext );
 
-													$inhalt .= $pageGenerator->getCache()->get();
+													$inhalt = $pageGenerator->getCache()->get();
+													//$inhalt = $oid;
 
 													break;
 												case BaseObject::TYPEID_LINK:
 													$l = new Link( $oid );
 													$l->load();
-													if	( $l->isLinkToObject )
+													$op = new BaseObject( $l->linkedObjectId );
+													$op->load();
+													if	( $op->isPage )
 													{
-														$op = new BaseObject( $l->linkedObjectId );
-														$op->load();
-														if	( $op->isPage )
-														{
-															$newPageContext = clone $pageContext;
-															$newPageContext->objectId = $l->linkedObjectId;
-															$pageGenerator = new PageGenerator( $newPageContext );
-
-															$inhalt .= $pageGenerator->getCache()->get();
-														}
+														$newPageContext = clone $pageContext;
+														$newPageContext->objectId = $l->linkedObjectId;
+														$pageGenerator = new PageGenerator( $newPageContext );
+
+														$inhalt .= $pageGenerator->getCache()->get();
 													}
 													break;
 											}