lapervenche
/
ZwiiCMS
forked from ZwiiCMS-Team/ZwiiCMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch '10303' into editeur

This commit is contained in:
Fred Tempez 2020-10-11 04:36:41 +02:00
parent f4d75f0142 589fe9f8cb
commit 088cd6fc69
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -15,7 +15,7 @@
## version 10.3.03
- Correction :
- Test incomplet dans le module de routage
- Doublons de lignes.
## version 10.3.02
- Corrections :

9
core/core.php
View File

@ -1797,7 +1797,7 @@ class core extends common {
}
// Check l'accès à la page
$access = null;
if($this->getData(['page', $this->getUrl(0)]) !== null)
if($this->getData(['page', $this->getUrl(0)]) !== null) {
if(
$this->getData(['page', $this->getUrl(0), 'group']) === self::GROUP_VISITOR
OR (
@ -1808,10 +1808,7 @@ class core extends common {
$access = true;
}
else {
if($this->getUrl(0) === 'user'
AND $this->getUrl(1) === 'login'
) {
if($this->getUrl(0) === $this->getData(['config', 'homePageId'])) {
$access = 'login';
}
else {
@ -1880,7 +1877,7 @@ class core extends common {
}
// Importe le module
else {
// Id du module, et valeurs en sortie de la page s'il s'agit d'un module de page
// Id du module, et valeurs en sortie de la page si il s'agit d'un module de page
if($access AND $this->getData(['page', $this->getUrl(0), 'moduleId'])) {
$moduleId = $this->getData(['page', $this->getUrl(0), 'moduleId']);