Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-10 02:52:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '18.0' into 18_fix_ticket_double_slash_on_url

Browse Source
This commit is contained in:
Laurent Destailleur
2025-12-17 13:27:57 +01:00
committed by GitHub
parent 8d84cec3ca a0be2c8890
commit 2ca80ffa67
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/api/class/api.class.php
View File

@@ -59,6 +59,18 @@ class DolibarrApi
$this->db = $db;
$production_mode = (empty($conf->global->API_PRODUCTION_MODE) ? false : true);
if ($production_mode) {
// Create the directory Defaults::$cacheDirectory if it does not exist. If dir does not exist, using production_mode generates an error 500.
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if (!dol_is_dir(Defaults::$cacheDirectory)) {
dol_mkdir(Defaults::$cacheDirectory, DOL_DATA_ROOT);
}
if (getDolGlobalString('MAIN_API_DEBUG')) {
dol_syslog("Debug API construct::cacheDirectory=".Defaults::$cacheDirectory, LOG_DEBUG, 0, '_api');
}
}
$this->r = new Restler($production_mode, $refreshCache);
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

2
htdocs/product/stats/bom.php
View File

@@ -230,7 +230,7 @@ if ($id > 0 || !empty($ref)) {
$bomtmp->ref = $objp->ref;
$product = new Product($db);
if (!empty($objp->fk_product)) {
if (!array_key_exists($product->id, $product_cache)) {
if (!array_key_exists($objp->fk_product, $product_cache)) {
$resultFetch = $product->fetch($objp->fk_product);
if ($resultFetch < 0) {
setEventMessages($product->error, $product->errors, 'errors');