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