Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2024-05-23 14:50:17 +02:00
parent f837227c41 5939421387
commit 66f4562300
52 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/functions.lib.php
View File

@@ -12697,6 +12697,13 @@ function getElementProperties($elementType)
$classfile = 'conferenceorbooth';
$classname = 'ConferenceOrBooth';
$module = 'eventorganization';
} elseif ($elementType == 'ccountry') {
$module = '';
$classpath = 'core/class';
$classfile = 'ccountry';
$classname = 'Ccountry';
$table_element = 'c_country';
$subelement = '';
}
if (empty($classfile)) {
@@ -12806,7 +12813,6 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us
//var_dump('element_type='.$element_type);
//var_dump($element_prop);
//var_dump($element_prop['module'].' '.$ismodenabled);
if (is_array($element_prop) && (empty($element_prop['module']) || $ismodenabled)) {
if ($useCache === 1
&& !empty($globalCacheForGetObjectFromCache[$element_type])