From 2f41223c2974e65be2bdec6262ba09a3a71bb29d Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sat, 27 Mar 2021 14:30:36 +0100
Subject: [PATCH] affichage correct d'une page avec module dans un lity

---
 core/core.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/core.php b/core/core.php
index 7dba8c8f..3b0dd128 100755
--- a/core/core.php
+++ b/core/core.php
@@ -2097,11 +2097,7 @@ class core extends common {
 					'iconUrl' => $this->getData(['page', $this->getUrl(0), 'iconUrl']),
 					'disable' => $this->getData(['page', $this->getUrl(0), 'disable']),
 					'contentRight' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'content']),
-					'contentLeft'  => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content']),
-					'display' => $this->getData(['page', $this->getUrl(0), 'lity']) === true
-								&& $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
-									? self::DISPLAY_LAYOUT_LITY 
-									: $this->output['display']
+					'contentLeft'  => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content'])
 				]);
 				$pageContent = $this->getData(['page', $this->getUrl(0), 'content']);
 			}
@@ -2179,7 +2175,10 @@ class core extends common {
 						// Affichage
 						if($output['display']) {
 							$this->addOutput([
-								'display' => $output['display']
+								'display' => $this->getData(['page', $this->getUrl(0), 'lity']) === true
+											&& $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
+												? self::DISPLAY_LAYOUT_LITY 
+												: $this->output['display']
 							]);
 						}
 						// Contenu brut