From 40a2ca6e7f90764520ba117b29061d6b1448a4fd Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Tue, 29 Nov 2022 09:00:17 +0100
Subject: [PATCH] Merge 11513

---
 core/core.php               | 2 +-
 core/vendor/tinymce/init.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core.php b/core/core.php
index 8c8b114b..469e3527 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2073,7 +2073,7 @@ class common
 	 */
 	public function showMetaImage()
 	{
-		$items = '<meta property="og:image" content="' . helper::baseUrl() . self::FILE_DIR . 'source/screenshot.jpg" />';
+		$items = '<meta property="og:image" content="' . helper::baseUrl(false) . self::FILE_DIR . 'source/screenshot.jpg" />';
 		$items .= '<meta property="og:image:type" content="image/jpeg" />';
 		$items .= '<meta property="og:image:width" content="1200" />';
 		$items .= '<meta property="og:image:height" content="627" />';
diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js
index efd7ab5b..dfa8048b 100755
--- a/core/vendor/tinymce/init.js
+++ b/core/vendor/tinymce/init.js
@@ -136,7 +136,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,
 	// Conversion des URLs
 	convert_urls : false,
 	// Url de base
@@ -326,7 +326,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,
 	// Conversion des URLs
 	convert_urls : false,
 	// Url de base