lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2015-03-22 22:30:11 +01:00
commit f650a773c3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/class/extrafields.class.php
View File

@ -567,10 +567,12 @@ class ExtraFields
{ {
global $conf; global $conf;
if ( empty($elementtype) ) return array();
if ($elementtype == 'thirdparty') $elementtype='societe'; if ($elementtype == 'thirdparty') $elementtype='societe';
$array_name_label=array(); $array_name_label=array();
// For avoid conflicts with external modules // For avoid conflicts with external modules
if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label; if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
@ -1054,6 +1056,7 @@ class ExtraFields
elseif ($type == 'link') elseif ($type == 'link')
{ {
$out=''; $out='';
$param_list=array_keys($param['options']); $param_list=array_keys($param['options']);
// 0 : ObjectName // 0 : ObjectName
// 1 : classPath // 1 : classPath
@ -1292,14 +1295,15 @@ class ExtraFields
elseif ($type == 'link') elseif ($type == 'link')
{ {
$out=''; $out='';
$param_list=array_keys($params['options']); // only if something to display (perf)
// 0 : ObjectName
// 1 : classPath
$InfoFieldList = explode(":", $param_list[0]);
dol_include_once($InfoFieldList[1]);
$object = new $InfoFieldList[0]($this->db);
if ($value) if ($value)
{ {
$param_list=array_keys($params['options']);
// 0 : ObjectName
// 1 : classPath
$InfoFieldList = explode(":", $param_list[0]);
dol_include_once($InfoFieldList[1]);
$object = new $InfoFieldList[0]($this->db);
$object->fetch($value); $object->fetch($value);
$value=$object->getNomUrl(3); $value=$object->getNomUrl(3);
} }