remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch '11000' into NewsColumn

Browse Source
This commit is contained in:
fredtempez 2021-03-30 19:40:10 +02:00
commit 9c9c95653c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -2101,7 +2101,6 @@ class core extends common {
$moduleId = $this->getUrl(0); $moduleId = $this->getUrl(0);
$pageContent = ''; $pageContent = '';
} }
// Check l'existence du module // Check l'existence du module
if(class_exists($moduleId)) { if(class_exists($moduleId)) {
/** @var common $module */ /** @var common $module */
@ -2173,7 +2172,7 @@ class core extends common {
// Affichage // Affichage
if($output['display']) { if($output['display']) {
$this->addOutput([ $this->addOutput([
'display' =>self::DISPLAY_LAYOUT_MAIN 'display' => $output['display']
]); ]);
} }
// Contenu brut // Contenu brut
@ -2343,7 +2342,7 @@ class core extends common {
]); ]);
} }
// Layout Lity lorsque l'option est active. // Layout Lity lorsque l'option est active.
if ( $this->getData(['page', $this->getUrl(0), 'lity']) === true ) { if ( $this->getData(['page', $this->getUrl(0), 'lity']) === true ) {
// Mode connecté pas de menu en mode connecté // Mode connecté pas de menu en mode connecté
if ( $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') ) { if ( $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') ) {
$this->addOutput([ $this->addOutput([
@ -2355,7 +2354,6 @@ class core extends common {
]); ]);
} }
} }
switch($this->output['display']) { switch($this->output['display']) {
// Layout brut // Layout brut
case self::DISPLAY_RAW: case self::DISPLAY_RAW: