From 64f72daa7e46ab1a037457bbb8de0d4a67fc6ae0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 23 May 2020 17:01:22 +0200 Subject: [PATCH] Fix hreflang if canonical page --- htdocs/core/lib/website2.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index cdad3fcced6..de5bb6d0ddd 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -164,8 +164,8 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage) // Add translation reference (main language) if ($object->isMultiLang()) { // Add myself - $tplcontent .= 'pageurl.'.php") { ?>'."\n"; - $tplcontent .= ''."\n"; + $tplcontent .= 'fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n"; + $tplcontent .= ''."\n"; // Add page "translation of" $translationof = $objectpage->fk_page; @@ -176,7 +176,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage) $tmpshortlangcode = ''; if ($tmppage->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en if ($tmpshortlangcode != $shortlangcode) { - $tplcontent .= ''."\n"; + $tplcontent .= ''."\n"; } } }