Skip to content

Commit

Permalink
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed May 23, 2024
2 parents a854e58 + 8b0cce4 commit 5939421
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion htdocs/core/lib/functions.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -12103,6 +12103,13 @@ function getElementProperties($element_type)
$classname = 'EmailSenderProfile';
$table_element = 'c_email_senderprofile';
$subelement = '';
} elseif ($element_type == 'ccountry') {
$module = '';
$classpath = 'core/class';
$classfile = 'ccountry';
$classname = 'Ccountry';
$table_element = 'c_country';
$subelement = '';
}

if (empty($classfile)) {
Expand Down Expand Up @@ -12181,7 +12188,6 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
//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)) {
dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');

Expand Down

0 comments on commit 5939421

Please sign in to comment.