Merge 11513

This commit is contained in:
Fred Tempez 2022-11-29 09:00:17 +01:00
parent cfd7f0f083
commit 40a2ca6e7f
2 changed files with 3 additions and 3 deletions

View File

@ -2073,7 +2073,7 @@ class common
*/ */
public function showMetaImage() 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:type" content="image/jpeg" />';
$items .= '<meta property="og:image:width" content="1200" />'; $items .= '<meta property="og:image:width" content="1200" />';
$items .= '<meta property="og:image:height" content="627" />'; $items .= '<meta property="og:image:height" content="627" />';

View File

@ -136,7 +136,7 @@ tinymce.init({
// Active l'onglet avancé lors de l'ajout d'une image // Active l'onglet avancé lors de l'ajout d'une image
image_advtab: true, image_advtab: true,
// Urls absolues // Urls absolues
relative_urls: false, relative_urls: true,
// Conversion des URLs // Conversion des URLs
convert_urls : false, convert_urls : false,
// Url de base // Url de base
@ -326,7 +326,7 @@ tinymce.init({
// Active l'onglet avancé lors de l'ajout d'une image // Active l'onglet avancé lors de l'ajout d'une image
image_advtab: true, image_advtab: true,
// Urls absolues // Urls absolues
relative_urls: false, relative_urls: true,
// Conversion des URLs // Conversion des URLs
convert_urls : false, convert_urls : false,
// Url de base // Url de base