diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 410710b3c98..753a243b8d1 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -144,7 +144,7 @@ function dolSavePageAlias($filealias, $object, $objectpage)
*/
function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, $backupold = 0)
{
- global $db;
+ global $conf, $db;
// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
dol_syslog("dolSavePageContent We regenerate the tpl page filetpl=".$filetpl);
@@ -221,8 +221,10 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
$tplcontent .= ''."\n";
$tplcontent .= ''."\n";
- // Add favicon
- if (in_array($objectpage->type_container, array('page', 'blogpost'))) {
+ // Add favicon if not already done in htmlheader
+ $htmldeaderindestdir = dol_sanitizePathName($conf->website->dir_temp.'/'.$object->ref.'/containers/htmlheader.html');
+ $htmlheader = fil_get_contents($htmldeaderindestdir);
+ if (in_array($objectpage->type_container, array('page', 'blogpost')) && !preg_match('/'.preg_quote('rel="icon"', '/').'/', $htmlheader)) {
$tplcontent .= ''."\n";
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index deb96e91a5f..0af8447d9af 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -7866,6 +7866,8 @@ select.multiselectononeline {
box-shadow: none !important;
margin-top: 1px !important;
margin-bottom: 0 !important;
+ margin-: 0px !important;
+ margin-: 3px !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0470497e044..8d1eced0a95 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -7693,6 +7693,8 @@ select.multiselectononeline {
box-shadow: none !important;
margin-top: 1px !important;
margin-bottom: 0 !important;
+ margin-: 0px !important;
+ margin-: 3px !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;