diff --git a/core/core.php b/core/core.php index c4374d2d..028690dc 100644 --- a/core/core.php +++ b/core/core.php @@ -1551,7 +1551,7 @@ class common { } // Affichage de la barre de membre simple if ( $this->getUser('group') === self::GROUP_MEMBER - && $this->getData(['theme','footer','displayMemberBar']) === true + && $this->getData(['theme','footer','memberBar']) === true ) { $items .= 'getData(['theme','footer','displaymemberAccount']) === false ? ' class="displayNone"' : ''; @@ -1669,9 +1669,7 @@ class common { } // Commandes pour les membres simples if($this->getUser('group') == self::GROUP_MEMBER - && ( $this->getData(['theme','menu','memberBar']) === true - || $this->getData(['theme','footer','displayMemberBar']) === false - ) + && $this->getData(['theme','menu','memberBar']) === true ) { if( $this->getData(['user', $this->getUser('id') , 'files']) === true) $itemsRight .= '
  • ' . template::ico('folder') . '
  • '; $itemsRight .= '
  • ' . template::ico('user', 'right') . '
  • '; diff --git a/core/include/update.inc.php b/core/include/update.inc.php index e453defd..9a130c21 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -837,7 +837,17 @@ if ($this->getData(['core', 'dataVersion']) < 11400) { // Mise à jour $this->setData(['core', 'dataVersion', 11400]); } +// Version 11.5.06 +if ($this->getData(['core', 'dataVersion']) < 11506) { + // Renommage de la barre de membre dans le pied de page + $data = $this->getData(['theme', 'footer', 'displayMemberBar']); + $this->setData(['theme', 'footer', 'memberBar', $data]); + $this->deleteData(['theme', 'footer', 'displayMemberBar']); + + // Mise à jour + $this->setData(['core', 'dataVersion', 11506]); +} // Version 12.0.00 if ($this->getData(['core', 'dataVersion']) < 12000) { // Supprime un cookie non nécessaire @@ -850,4 +860,4 @@ if ($this->getData(['core', 'dataVersion']) < 12000) { // Mise à jour $this->setData(['core', 'dataVersion', 11400]); -} +} \ No newline at end of file diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index e8e76d10..6495de9d 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -255,7 +255,7 @@ class init extends common { 'displayCookie' => false, 'displayLegal' => false, 'displaySearch' => false, - 'displayMemberBar' => false, + 'memberBar' => true, 'template' => '3' ], 'header' => [ @@ -298,7 +298,7 @@ class init extends common { 'activeColor' => 'rgba(255, 255, 255, 1)', 'activeTextColor' => 'rgba(255, 255, 255, 1)', 'radius' => '0px', - 'memberBar' => true, + 'memberBar' => false, 'burgerLogo' => '', 'burgerContent' => 'title', 'width' => 'container' diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 86fbc8c9..01dcdfff 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -379,7 +379,7 @@ class theme extends common { 'displayCookie' => $this->getInput('themefooterDisplayCookie', helper::FILTER_BOOLEAN), 'displayLegal' => $this->getInput('themeFooterDisplayLegal', helper::FILTER_BOOLEAN), 'displaySearch' => $this->getInput('themeFooterDisplaySearch', helper::FILTER_BOOLEAN), - 'displayMemberBar'=> $this->getInput('themeFooterDisplayMemberBar', helper::FILTER_BOOLEAN), + 'memberBar'=> $this->getInput('themeFooterMemberBar', helper::FILTER_BOOLEAN), 'template' => $this->getInput('themeFooterTemplate') ]]); diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index fad814cc..f6182e00 100644 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -118,8 +118,8 @@ ]); ?>
    - $this->getData(['theme', 'footer', 'displayMemberBar']), + $this->getData(['theme', 'footer', 'memberBar']), 'help' => 'Affiche les icônes de gestion du compte et de déconnexion des membres simples connectés, ne s\'applique pas aux éditeurs et administrateurs.' ]); ?>