From 7bce73f55341ea47099874584a1003271b263118 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 8 Apr 2022 11:05:59 +0200
Subject: [PATCH 1/2] Initialise les BDD vides

---
 core/core.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/core.php b/core/core.php
index 1a5dc92f..42cbf3ec 100644
--- a/core/core.php
+++ b/core/core.php
@@ -303,7 +303,9 @@ class common {
 		// La langue d'installation par défaut est fr
 		foreach ($this->dataFiles as $stageId => $item) {
 			$folder = $this->dataPath ($stageId, self::$i18n);
-			if (file_exists($folder . $stageId .'.json') === false) {
+			if ( file_exists($folder . $stageId .'.json') === false ||
+					$this->getData([$stageId]) === NULL
+				) {
 				$this->initData($stageId, self::$i18n);
 				common::$coreNotices [] = $stageId ;
 			}

From 524bf1248e31ba6cea94105a45723c44ec392f0d Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Tue, 12 Apr 2022 13:26:08 +0200
Subject: [PATCH 2/2] bug url relative dans tinymce

---
 core/include/update.inc.php | 2 ++
 core/vendor/tinymce/init.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index b3b09894..1a54b74f 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -967,6 +967,7 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
 	}
 
 	// Transforme les URL en références relatives
+	/*
 	$baseUrl = $this->getData(['core', 'baseUrl']);
 	$baseUrl2 = str_replace('?', '', $baseUrl);
 	foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
@@ -982,6 +983,7 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
 		$s = str_replace ($baseUrl2, './', $s);
 		$this->setPage( $parent, $s, self::$i18n);
 	}
+	*/
 
 	// Suppression de la variable URL dans core
 	//$this->deleteData(['core', 'baseUrl']);
diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js
index b5d300d6..b4d3bad3 100755
--- a/core/vendor/tinymce/init.js
+++ b/core/vendor/tinymce/init.js
@@ -294,7 +294,7 @@ tinymce.init({
 	// Active l'onglet avancé lors de l'ajout d'une image
 	image_advtab: true,
 	// Urls absolues
-	relative_urls: false,
+	relative_urls: true,
 	// Url de base
 	document_base_url: baseUrl,
 	// Contenu du bouton formats