remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch 'master' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-03-31 12:49:03 +02:00
commit 4b7626ea91
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.gitignore vendored Normal file
View File

@ -0,0 +1,33 @@
# Fichiers temporaires
site/tmp/*.zip
site/tmp/*.gz
# Sauvegardes
site/backup/*
# Fichiers de données
site/data/*.json
site/data/*.css
site/data/fr/*.json
# Fichiers uploadés
site/file/source/*
site/file/thumb/*
# Dossiers vides dans GitHub
!.gitkeep
/.git
# PHPStorm
.idea/
# Trucs
core/vendor/tinymce/link_list.json
site/tmp/.htaccess
.vscode/*
site/data/body.inc.html
site/data/head.inc.html
sitemap.xml.gz
sitemap.xml
robots.txt

10
core/core.php
View File

@ -1105,11 +1105,19 @@ class common {
$this->setData(['config', 'proxyType', 'tcp://' ]);
$this->setData(['core', 'dataVersion', 9223]);
}
// Version 9.3.00
if($this->getData(['core', 'dataVersion']) < 9300) {
// Forcer la régénération du thème
if (file_exists(self::DATA_DIR.'theme.css') === false) {
unlink (self::DATA_DIR.'theme.css');
}
$this->setData(['core', 'dataVersion', 9300]);
}
// Version 10.0.00
if($this->getData(['core', 'dataVersion']) < 10000) {
$this->setData(['config', 'faviconDark','faviconDark.ico']);
$this->setData(['core', 'dataVersion', 10000]);
}
}
}
}