From c9321eb30b1b79e48ff0c1e978b80dea97d42a51 Mon Sep 17 00:00:00 2001 From: alsoft10 Date: Thu, 26 Sep 2024 11:25:49 +0530 Subject: [PATCH 1/3] #31131 --- htdocs/main.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7a8f3cebb3737..cb2591a4dba7d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2175,9 +2175,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr //If you want to load custom javascript file from your selected theme directory if (getDolGlobalString('ALLOW_THEME_JS')) { - $theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0); + $theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js.php', 0); if (file_exists($theme_js)) { - print ''."\n"; + print ''."\n"; } } From 25754d87c98d5f3204bd29ec8926e2119ad75849 Mon Sep 17 00:00:00 2001 From: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Date: Thu, 26 Sep 2024 22:38:38 +0200 Subject: [PATCH 2/3] FIX : FATAL ERROR abusively triggered due to incomplete regex (#31052) * Fix regex detection * New regular expression to include offset --- htdocs/core/db/DoliDB.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 8895cdf83ec87..507e88c57e9c5 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -421,7 +421,7 @@ public function getRow($sql) */ public function getRows($sql) { - if (!preg_match('/LIMIT \d+$/', $sql)) { + if (!preg_match('/LIMIT \d+(?:(?:,\ *\d*)|(?:\ +OFFSET\ +\d*))?\ *;?$/', $sql)) { trigger_error(__CLASS__ .'::'.__FUNCTION__.'() query must have a LIMIT clause', E_USER_ERROR); } From c890345cc8cdf160fa06c8f8a9f23345b86a1a49 Mon Sep 17 00:00:00 2001 From: alsoft10 Date: Fri, 27 Sep 2024 18:09:34 +0530 Subject: [PATCH 3/3] FIX#31163 --- ...company.key.sql => llx_product_perentity_multicompany.key.sql} | 0 ...ty-multicompany.sql => llx_product_perentity_multicompany.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename htdocs/install/mysql/tables/{llx_product_perentity-multicompany.key.sql => llx_product_perentity_multicompany.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_product_perentity-multicompany.sql => llx_product_perentity_multicompany.sql} (100%) diff --git a/htdocs/install/mysql/tables/llx_product_perentity-multicompany.key.sql b/htdocs/install/mysql/tables/llx_product_perentity_multicompany.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_product_perentity-multicompany.key.sql rename to htdocs/install/mysql/tables/llx_product_perentity_multicompany.key.sql diff --git a/htdocs/install/mysql/tables/llx_product_perentity-multicompany.sql b/htdocs/install/mysql/tables/llx_product_perentity_multicompany.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_product_perentity-multicompany.sql rename to htdocs/install/mysql/tables/llx_product_perentity_multicompany.sql