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

This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-01-10 10:43:05 +01:00
commit 40eb24917b

View File

@ -230,15 +230,13 @@ $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than curren
$urlok = $urlwithroot.'/public/payment/paymentok.php?';
$urlko = $urlwithroot.'/public/payment/paymentko.php?';
/*
if ($ws) {
if ($ws && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { // So defined('USEEXTERNALSERVER') should be set but is not always
include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
$tmpwebsite = new WebSite($db);
$tmpwebsite->fetch(0, $ws);
$urlok = $tmpwebsite->virtualhost.'/public/payment/paymentok.php?';
$urlko = $tmpwebsite->virtualhost.'/public/payment/paymentko.php?';
}
*/
// Complete urls for post treatment
$ref = $REF = GETPOST('ref', 'alpha');