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

merge master

Browse Source
This commit is contained in:
fredtempez 2020-01-01 18:29:09 +01:00
commit 50aeb22034
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core.php
View File

@ -805,7 +805,6 @@ class common {
}
}
/**
* Sauvegarde des données
* @param array $keys Clé(s) des données
@ -983,7 +982,7 @@ class common {
if($this->getData(['core', 'dataVersion']) < 9210) {
// Utile pour l'installation d'un backup sur un autre serveur
$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
//$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
// Suppression d'une option de hauteur de la bannière
if ($this->getData(['theme', 'header','height']) === 'none') {
@ -998,6 +997,8 @@ class common {
$pageList = array();
$pageList = array();
foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
$pageList [] = $parentKey;
foreach ($parentValue as $childKey) {