From 384c620ae798c7667912317afbe39b443a23f6cd Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 2 Dec 2020 19:08:07 +0100 Subject: [PATCH] bug installation --- core/core.php | 25 +++---------------- core/module/install/ressource/defaultdata.php | 16 +----------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/core/core.php b/core/core.php index b55c6117..8317f077 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.008'; + const ZWII_VERSION = '10.4.00.009'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1565,7 +1565,8 @@ class common { } } } - // Localisation + + // Création du fichier locale.json $this->setData(['locale','homePageId',$this->getData(['config','homePageId'])]); $this->setData(['locale','page404',$this->getData(['config','page404'])]); $this->setData(['locale','page403',$this->getData(['config','page403'])]); @@ -1574,25 +1575,7 @@ class common { $this->setData(['locale','searchPageId',$this->getData(['config','searchPageId'])]); $this->setData(['locale','metaDescription',$this->getData(['config','metaDescription'])]); $this->setData(['locale','title',$this->getData(['config','title'])]); - $this->setData(['config','translate','scriptGoogle',false]); - $this->setData(['config','translate','showCredits',false]); - $this->setData(['config','translate','admin',false]); - $this->setData(['config','translate','autoDetect',false]); - $this->setData(['config','translate','scriptFR',false]); - $this->setData(['config','translate','scriptDE',false]); - $this->setData(['config','translate','scriptEN',false]); - $this->setData(['config','translate','scriptES',false]); - $this->setData(['config','translate','scriptIT',false]); - $this->setData(['config','translate','scriptNL',false]); - $this->setData(['config','translate','scriptPT',false]); - $this->setData(['config','translate','site',false]); - $this->setData(['config','translate','siteFR',false]); - $this->setData(['config','translate','siteDE',false]); - $this->setData(['config','translate','siteEN',false]); - $this->setData(['config','translate','siteES',false]); - $this->setData(['config','translate','siteIT',false]); - $this->setData(['config','translate','siteNL',false]); - $this->setData(['config','translate','sitePT',false]); + $this->setData(['core', 'dataVersion', 10400]); /** diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index cc42cfdf..c6ef26dd 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -34,23 +34,9 @@ class init extends common { 'log' => false, 'captcha' => true ], - 'translate' => [ - 'scriptGoogle' => false, - 'showCredits' => false, - 'autoDetect' => false, - 'admin' => false, - 'translateFlagFR' => true, - 'translateFlagDE' => true, - 'translateFlagEN' => true, - 'translateFlagES' => false, - 'translateFlagIT' => false, - 'translateFlagNL' => false, - 'translateFlagPT' => false - - ], ], 'core' => [ - 'dataVersion' => 10306, + 'dataVersion' => 10400, 'lastBackup' => 0, 'lastClearTmp' => 0, 'lastAutoUpdate' => 0,