forked from ZwiiCMS-Team/ZwiiCMS
Merge branch '11000' into NewsColumn
This commit is contained in:
commit
9c9c95653c
@ -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
|
||||||
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user