ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Update non effacé après mise à jour 10.1 vers 10.2 cause option de sécurité

Browse Source
This commit is contained in:
Fred Tempez 2020-06-25 12:08:57 +02:00
parent 8756ff4bd5
commit 9d312c5582
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -1331,12 +1331,12 @@ class common {
$this->setData(['theme','menu','memberBar',true]); $this->setData(['theme','menu','memberBar',true]);
$this->setData(['theme','footer','displayMemberAccount',false]); $this->setData(['theme','footer','displayMemberAccount',false]);
$this->setData(['theme','footer','displayMemberLogout',false]); $this->setData(['theme','footer','displayMemberLogout',false]);
$this->setData(['core', 'dataVersion', 10200]);
// Thème Menu : couleur de page active non définie // Thème Menu : couleur de page active non définie
if (!$this->getData(['theme','menu','activeTextColor']) ) { if (!$this->getData(['theme','menu','activeTextColor']) ) {
$this->setData(['theme','menu','activeTextColor', $this->getData(['theme','menu','textColor']) ]); $this->setData(['theme','menu','activeTextColor', $this->getData(['theme','menu','textColor']) ]);
} }
$this->setData(['core', 'updateAvailable', false]);
$this->setData(['core', 'dataVersion', 10200]);
} }
} }
} }
@ -2613,7 +2613,7 @@ class layout extends common {
helper::checkNewVersion(common::ZWII_UPDATE_CHANNEL)) { helper::checkNewVersion(common::ZWII_UPDATE_CHANNEL)) {
$this->setData(['core','updateAvailable', true]); $this->setData(['core','updateAvailable', true]);
$this->setData(['core','lastAutoUpdate',$lastAutoUpdate]); $this->setData(['core','lastAutoUpdate',$lastAutoUpdate]);
} }
// Afficher le bouton : Mise à jour détectée + activée // Afficher le bouton : Mise à jour détectée + activée
if ( $this->getData(['core','updateAvailable']) === true && if ( $this->getData(['core','updateAvailable']) === true &&
$this->getData(['config','autoUpdate']) === true ) { $this->getData(['config','autoUpdate']) === true ) {