diff --git a/CHANGES.md b/CHANGES.md index a61b4423..12b2ebbb 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,10 +18,17 @@ - Traduction automatique dans la langue du navigateur. - Amélioration de la structure du flux RSS. +## Version 10.3.11 +Modification : + - Message sur l'utilisation des cookies +Coorection : + - Recherche inopérante dans les articles des blogs. + ## Version 10.3.10 Corrections : - Conflit page inactive et droit d'un membre. - Module de recherche, correction dans les pages enfants. + - Module formulaire, perte des données en cas d'édition du fomulaire ou des champs. Modification : - TinyMCE nettoyage init.js d'options non supportées. diff --git a/core/core.php b/core/core.php index 2d6f9cf9..07c5b9d3 100755 --- a/core/core.php +++ b/core/core.php @@ -44,7 +44,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.4.00.009'; + const ZWII_VERSION = '10.4.00.010'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1929,9 +1929,9 @@ class core extends common { } // Empêcher l'accès aux page désactivée par URL directe if ( ( $this->getData(['page', $this->getUrl(0),'disable']) === true - AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ) OR ( - $this->getData(['page', $this->getUrl(0),'disable']) === true + AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + ) OR ( + $this->getData(['page', $this->getUrl(0),'disable']) === true AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('group') < self::GROUP_MODERATOR ) @@ -2297,7 +2297,7 @@ class layout extends common { * Affiche le script Google Analytics */ public function showAnalytics() { - if($code = $this->getData(['config', 'analyticsId']) + if($code = $this->getData(['config', 'analyticsId']) AND $this->getInput('ZWII_COOKIE_CONSENT') === 'true') { echo ' @@ -2567,9 +2567,9 @@ class layout extends common { $itemsLeft .= '
  • '; if ( ( $this->getData(['page',$parentPageId,'disable']) === true - AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ) OR ( - $this->getData(['page',$parentPageId,'disable']) === true + AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + ) OR ( + $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('group') < self::GROUP_MODERATOR ) @@ -2627,9 +2627,9 @@ class layout extends common { // Mise en page du sous-item $itemsLeft .= '
  • '; if ( ( $this->getData(['page',$childKey,'disable']) === true - AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ) OR ( - $this->getData(['page',$childKey,'disable']) === true + AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + ) OR ( + $this->getData(['page',$childKey,'disable']) === true AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('group') < self::GROUP_MODERATOR ) diff --git a/module/search/search.php b/module/search/search.php index 49fe78d6..b2a41f07 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -126,8 +126,8 @@ class search extends common { foreach($childIds as $childId) { // Sous page if ($this->getData(['page', $childId, 'disable']) === false && - $this->getUser('group') >= $this->getData(['page', $childId, 'group']) && - $this->getData(['page', $childId, 'block']) !== 'bar') { + $this->getUser('group') >= $this->getData(['page', $parentId, 'group']) && + $this->getData(['page', $parentId, 'block']) !== 'bar') { $url = $childId; $titre = $this->getData(['page', $childId, 'title']); $contenu = ' ' . $titre . ' ' . $this->getData(['page', $childId, 'content']);