From 94f7d2177aba374aec6a8211cf14aaffd00d013a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Mar 2024 00:18:42 +0100 Subject: [PATCH] Fix for external server mode --- htdocs/core/website.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php index 687fa050564..34f6d1a0945 100644 --- a/htdocs/core/website.inc.php +++ b/htdocs/core/website.inc.php @@ -82,7 +82,12 @@ if (!empty($pageid) && $pageid > 0) { } if (empty($srclang)) { $reg = array(); - if (preg_match('/^(\w\w)\//', $_GET['pageref'], $reg)) { // We reuse $_GET['pageref'] because $pageref may have been cleaned already from the language code. + // With Dolibarr server, url is in parameter pageref + if (defined('USEDOLIBARRSERVER') && !empty($_GET['pageref']) && preg_match('/^\/?(\w\w)\//', $_GET['pageref'], $reg) && $reg[1] != 'js') { // We reuse $_GET['pageref'] because $pageref may have been cleaned already from the language code. + $srclang = $reg[1]; + } + // With External server, url is in parameter pageref + if (defined('USEEXTERNALSERVER') && !empty($_SERVER['PHP_SELF']) && preg_match('/^\/?(\w\w)\//', $_SERVER['PHP_SELF'], $reg) && $reg[1] != 'js') { $srclang = $reg[1]; } }