From 899b02cf799a6b336f3a2fd51398eb4c8994cee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Fri, 27 May 2022 20:49:23 +0200
Subject: [PATCH 1/3] update download 2.6 dans le module

---
 core/include/update.inc.php | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index 28301d62..4ffa9beb 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -964,25 +964,3 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
 	$this->setData(['core', 'dataVersion', 11400]);
 }
 
-// Version 11.4.03
-if ($this->getData(['core', 'dataVersion']) < 11403) {
-
-	// Modification de structure du module download
-	foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
-		$pageList [] = $parentKey;
-		foreach ($parentValue as $childKey) {
-			$pageList [] = $childKey;
-		}
-	}
-	foreach ($pageList as $parentKey => $parent) {
-		if ($this->getData(['page', $parent, 'moduleId']) === 'download') {
-			$tempData = $this->getData(['module', $parent, 'items']);
-			$this->setData(['module', $parent, 'posts', $tempData]);
-			$this->deleteData(['module', $parent, 'items']);
-		}
-	}
-	
-	// Mise à jour
-	$this->setData(['core', 'dataVersion', 11403]);
-
-}
\ No newline at end of file

From 1db350e937a2a06bd1c21df1d601ff5e8de4b270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 28 May 2022 18:03:43 +0200
Subject: [PATCH 2/3] search simplification du test

---
 module/search/search.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/module/search/search.php b/module/search/search.php
index dab8b724..0c46699f 100644
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -254,12 +254,7 @@ class search extends common {
 							}
 
 							// Articles d'une sous-page blog ou de news
-							if (
-								 ( $this->getData(['page', $childId, 'moduleId']) === 'blog' 
-								 || $this->getData(['page', $childId, 'moduleId']) === 'news'
-								 || $this->getData(['page', $childId, 'moduleId']) === 'download'
-								 )
-								&& $this->getData(['module',$childId,'posts']) 
+							if ( $this->getData([ 'module', $childId, 'posts', 'content']) 
 							) {
 								foreach($this->getData(['module',$childId,'posts']) as $articleId => $article) {
 									if($this->getData(['module',$childId,'posts',$articleId,'state']) === true)  {
@@ -277,12 +272,7 @@ class search extends common {
                     }
 
 					// Articles d'un blog ou de news
-					if (
-						( $this->getData(['page', $parentId, 'moduleId']) === 'blog' 
-						|| $this->getData(['page', $parentId, 'moduleId']) === 'news'
-						|| $this->getData(['page', $parentId, 'moduleId']) === 'download'
-						)
-						&& $this->getData(['module',$parentId,'posts']) 
+					if ( $this->getData([ 'module', $parentId, 'posts', 'content']) 
 				   ) {					
 
 						foreach($this->getData(['module',$parentId,'posts']) as $articleId => $article) {

From 264ae85f0f72ba3b0725976b1a02cef1e12ef871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 28 May 2022 18:04:35 +0200
Subject: [PATCH 3/3] version 11.5

---
 CHANGES.md    | 2 +-
 README.md     | 2 +-
 core/core.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c10b9142..456d70be 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Version 11.4.03
+## Version 11.5.00
 ### Corrections : 
 - Ajout d'un nouvelle page, le nom court n'est pas défini.
 - Bug de la fonction de copie interne utilisée lors de l'installation de la copie de thème, etc..
diff --git a/README.md b/README.md
index aaa23fad..fed19d83 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ZwiiCMS 11.4.00
+# ZwiiCMS 11.5.00
 
 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
 
diff --git a/core/core.php b/core/core.php
index 335a6a4e..e1b7045e 100644
--- a/core/core.php
+++ b/core/core.php
@@ -45,7 +45,7 @@ class common {
 
 	// Numéro de version
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
-	const ZWII_VERSION = '11.4.03';
+	const ZWII_VERSION = '11.5.00';
 	const ZWII_UPDATE_CHANNEL = "v11";
 
 	public static $actions = [];