From 783bf103eb6ce9b3a7edadb3f482bd7b64e2d0bc Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 19 Jun 2019 03:42:05 +0200 Subject: [PATCH 1/4] [9.1.12] erreur css --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index 1236829b..51aae034 100644 --- a/core/core.php +++ b/core/core.php @@ -1007,7 +1007,7 @@ class core extends common { $css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}'; $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': ''; $css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : ''; - $css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223}'; + $css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}'; $colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor'])); $css .= '.speechBubble,.button,.button:hover,button[type=\'submit\'],.pagination a,.pagination a:hover,input[type=\'checkbox\']:checked + label:before,input[type=\'radio\']:checked + label:before,.helpContent{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . '}'; $css .= '.helpButton span{color:' . $colors['normal'] . '}'; From 528153e13cba7a0858554306a627e0b0e3003cfd Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 20 Jun 2019 18:58:49 +0200 Subject: [PATCH 2/4] [9.1.13] erreur supp metaimage --- core/module/config/config.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/module/config/config.php b/core/module/config/config.php index 63d392d8..3dc5e1f5 100755 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -240,7 +240,9 @@ class config extends common { $data = 'data:image/jpeg;base64,'.$screenshot; $data = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data)); // Effacer la miniature - unlink (self::FILE_DIR.'thumb/screenshot.png'); + if (file_exists(self::FILE_DIR.'thumb/screenshot.png')) { + unlink (self::FILE_DIR.'thumb/screenshot.png'); + } file_put_contents( self::FILE_DIR.'source/screenshot.png',$data); $success =true; } From 2358ab291e399e47fd3127e43aaa4ae70ef65cc6 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 20 Jun 2019 19:01:11 +0200 Subject: [PATCH 3/4] [9.1.13] erreur suppr imagetag (encore Free ) --- CHANGES.md | 3 +++ core/core.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d95a50e6..48112843 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ # Changelog ## Version 9.1.12 +- Correction : + - OpenGraph : pb lors de la suppression de l'imagette + - Amélioration : - Contrôle d'erreur dans la gestion de l'imagette OpenGraph - Correction: diff --git a/core/core.php b/core/core.php index 51aae034..811d8015 100644 --- a/core/core.php +++ b/core/core.php @@ -32,7 +32,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '9.1.12'; + const ZWII_VERSION = '9.1.13'; public static $actions = []; public static $coreModuleIds = [ From 9e25104b0e2d1964421d4874c1f61e033d9d5fb3 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 20 Jun 2019 20:26:08 +0200 Subject: [PATCH 4/4] [9.1.13] erreur sitemap blog sans article ! --- core/core.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core.php b/core/core.php index 811d8015..e8940e27 100644 --- a/core/core.php +++ b/core/core.php @@ -680,7 +680,8 @@ class common { $sitemap->addUrl($childKey,$datetime); // La sous-page est un blog - if ($this->getData(['page', $childKey, 'moduleId']) === 'blog') { + if ($this->getData(['page', $childKey, 'moduleId']) === 'blog' && + !empty($this->getData(['module',$childKey])) ) { foreach($this->getData(['module',$childKey]) as $articleId => $article) { if($this->getData(['module',$childKey,$articleId,'state']) === true) { $date = $this->getData(['module',$childKey,$articleId,'publishedOn']); @@ -690,7 +691,8 @@ class common { } } // Articles du blog - if ($this->getData(['page', $parentPageId, 'moduleId']) === 'blog') { + if ($this->getData(['page', $parentPageId, 'moduleId']) === 'blog' && + !empty($this->getData(['module',$parentPageId])) ) { foreach($this->getData(['module',$parentPageId]) as $articleId => $article) { if($this->getData(['module',$parentPageId,$articleId,'state']) === true) { $date = $this->getData(['module',$parentPageId,$articleId,'publishedOn']);