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

Merge branch 'master' into extra_footer

Browse Source
This commit is contained in:
fredtempez 2019-06-20 20:27:06 +02:00
commit 2be1cdac5c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -1,6 +1,9 @@
# Changelog # Changelog
## Version 9.1.12 ## Version 9.1.12
- Correction :
- OpenGraph : pb lors de la suppression de l'imagette
- Amélioration : - Amélioration :
- Contrôle d'erreur dans la gestion de l'imagette OpenGraph - Contrôle d'erreur dans la gestion de l'imagette OpenGraph
- Correction: - Correction:

6
core/core.php
View File

@ -681,7 +681,8 @@ class common {
$sitemap->addUrl($childKey,$datetime); $sitemap->addUrl($childKey,$datetime);
// La sous-page est un blog // 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) { foreach($this->getData(['module',$childKey]) as $articleId => $article) {
if($this->getData(['module',$childKey,$articleId,'state']) === true) { if($this->getData(['module',$childKey,$articleId,'state']) === true) {
$date = $this->getData(['module',$childKey,$articleId,'publishedOn']); $date = $this->getData(['module',$childKey,$articleId,'publishedOn']);
@ -691,7 +692,8 @@ class common {
} }
} }
// Articles du blog // 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) { foreach($this->getData(['module',$parentPageId]) as $articleId => $article) {
if($this->getData(['module',$parentPageId,$articleId,'state']) === true) { if($this->getData(['module',$parentPageId,$articleId,'state']) === true) {
$date = $this->getData(['module',$parentPageId,$articleId,'publishedOn']); $date = $this->getData(['module',$parentPageId,$articleId,'publishedOn']);

4
core/module/config/config.php
View File

@ -240,7 +240,9 @@ class config extends common {
$data = 'data:image/jpeg;base64,'.$screenshot; $data = 'data:image/jpeg;base64,'.$screenshot;
$data = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data)); $data = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data));
// Effacer la miniature // 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); file_put_contents( self::FILE_DIR.'source/screenshot.png',$data);
$success =true; $success =true;
} }