From 192ac39831892ab269617cdd14e383e17c4e9b71 Mon Sep 17 00:00:00 2001 From: hansemschnokeloch Date: Wed, 28 Jan 2026 18:01:17 +0100 Subject: [PATCH 1/4] Remove jstz.min.js from JavaScript array (#37017) jstz.min.js was deleted in https://github.com/Dolibarr/dolibarr/commit/5599ac733b07d990d64e3ff18b30b3dca16d5b86 --- htdocs/core/modules/openid_connect/callback.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/modules/openid_connect/callback.php b/htdocs/core/modules/openid_connect/callback.php index ae55082a163..ce969b08482 100644 --- a/htdocs/core/modules/openid_connect/callback.php +++ b/htdocs/core/modules/openid_connect/callback.php @@ -38,7 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second $arrayofjs = array( - '/includes/jstz/jstz.min.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)), '/core/js/dst.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)) ); From 65c38c92fb3ab95ab524687115b4dd7554108501 Mon Sep 17 00:00:00 2001 From: atm-jonathan <146709163+atm-jonathan@users.noreply.github.com> Date: Wed, 28 Jan 2026 18:21:32 +0100 Subject: [PATCH 2/4] prevent ST_AsWKT() (#37013) * prevent ST_AsWKT() * Update commonobject.class.php --------- Co-authored-by: Laurent Destailleur --- htdocs/core/class/commonobject.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 520a84e9c92..3e3299094d5 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6624,7 +6624,7 @@ abstract class CommonObject $sql .= ", ".$name; } // use geo sql fonction to read as text - if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || in_array($extrafields->attributes[$this->table_element]['type'][$name], array('point', 'multipts', 'linestrg', 'polygon'))) { + if (!empty($extrafields->attributes[$this->table_element]['type'][$name]) && in_array($extrafields->attributes[$this->table_element]['type'][$name], array('point', 'multipts', 'linestrg', 'polygon'))) { // TODO Add an abstraction method in the database driver $sql .= ", ST_AsWKT(".$name.") as ".$name; } From 28925a4fa1fc06cd6880140ffacf8d688e18d9dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Jan 2026 19:19:59 +0100 Subject: [PATCH 3/4] css --- htdocs/theme/eldy/global.inc.php | 2 ++ htdocs/theme/md/style.css.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 104b7da2e2b..d42f0ad495c 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -7864,6 +7864,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 8d77b1ca90a..70081a02ca2 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; From ca017aa34215605aa79ea6c6fb290b338dba15df Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 29 Jan 2026 10:55:21 +0100 Subject: [PATCH 4/4] Debug v23 --- htdocs/core/lib/website2.lib.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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"; }