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

bug filtre fonte installée

Browse Source
This commit is contained in:
Fred Tempez 2022-04-22 11:06:49 +02:00
parent bb0436f79f
commit fa4eaa9576
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/module/theme/theme.php
View File

@ -499,6 +499,7 @@ class theme extends common {
* Accueil de la personnalisation
*/
public function index() {
// Restaurer les fontes utilisateurs
$this->setFonts('user');
@ -563,7 +564,7 @@ class theme extends common {
*/
public function fonts() {
// Toutes les fontes installées
// Toutes les fontes installées sont chargées
$this->setFonts('all');
// Polices liées au thème
@ -1181,7 +1182,7 @@ class theme extends common {
$fileContent = '';
foreach ($this->getData(['fonts', 'imported']) as $fontId => $fontValue) {
if (
( $scope === 'user' && array_key_exists($fontId, $fontsInstalled) )
( $scope === 'user' && in_array($fontId, $fontsInstalled) )
|| $scope === 'all'
) {
$fileContent .= '<link href="' . $fontValue['resource'] .'" rel="stylesheet">';
@ -1203,7 +1204,7 @@ class theme extends common {
$fileContent = '';
foreach ($this->getData(['fonts', 'files']) as $fontId => $fontValue) {
if (
( $scope === 'user' && array_key_exists($fontId, $fontsInstalled) )
( $scope === 'user' && in_array($fontId, $fontsInstalled) )
|| $scope === 'all'
) {
if (file_exists(self::DATA_DIR . 'fonts/' . $fontValue['resource']) ) {