Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2026-01-29 11:28:53 +01:00
commit 758ee4bef7
3 changed files with 9 additions and 3 deletions

View file

@ -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 .= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
$tplcontent .= '<meta name="dolibarr:pageid" content="'.((int) $objectpage->id).'" />'."\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 .= '<link rel="icon" type="image/png" href="/favicon.png" />'."\n";
}

View file

@ -7866,6 +7866,8 @@ select.multiselectononeline {
box-shadow: none !important;
margin-top: 1px !important;
margin-bottom: 0 !important;
margin-<?php echo $left ?>: 0px !important;
margin-<?php echo $right ?>: 3px !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;

View file

@ -7693,6 +7693,8 @@ select.multiselectononeline {
box-shadow: none !important;
margin-top: 1px !important;
margin-bottom: 0 !important;
margin-<?php echo $left ?>: 0px !important;
margin-<?php echo $right ?>: 3px !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;