From 0dc88fe9ba0f9ab899e2589f49e2c5bef71bb348 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Tue, 28 Jan 2025 16:02:23 +0100 Subject: [PATCH] Fix error management of website module --- htdocs/core/lib/website2.lib.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index 04a18bc25b3..c52f98d2b91 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -67,8 +67,9 @@ function dolSavePageAlias($filealias, $object, $objectpage) $aliascontent = 'id.'.tpl.php\'; '; - $aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; + $aliascontent .= 'if (empty($dolibarr_main_data_root)) $res=include \'./page'.$objectpage->id.'.tpl.php\'; '; + $aliascontent .= 'else $res=include $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; + $aliascontent .= 'if ($res === false) { http_response_code(500); print \'Failed to make include\'; }'."\n"; $aliascontent .= '?>'."\n"; $result = file_put_contents($filealias, $aliascontent); if ($result === false) { @@ -87,8 +88,9 @@ function dolSavePageAlias($filealias, $object, $objectpage) $aliascontent = 'id.'.tpl.php\'; '; - $aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; + $aliascontent .= 'if (empty($dolibarr_main_data_root)) $res=include \'../page'.$objectpage->id.'.tpl.php\'; '; + $aliascontent .= 'else $res=include $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; + $aliascontent .= 'if ($res === false) { http_response_code(500); print \'Failed to make include\'; }'."\n"; $aliascontent .= '?>'."\n"; $result = file_put_contents($filealiassub, $aliascontent); if ($result === false) { @@ -110,8 +112,9 @@ function dolSavePageAlias($filealias, $object, $objectpage) $aliascontent = 'id.'.tpl.php\'; '; - $aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; + $aliascontent .= 'if (empty($dolibarr_main_data_root)) $res=include \'../page'.$objectpage->id.'.tpl.php\'; '; + $aliascontent .= 'else $res=include $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; + $aliascontent .= 'if ($res === false) { http_response_code(500); print \'Failed to make include\'; }'."\n"; $aliascontent .= '?>'."\n"; dol_mkdir($dirname.'/'.$sublang);