composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2174 External field label retrieval : fix default value

Browse Source 
\AttributeDefinition::GetLabel with default null was returning att code !! Added PHPDoc and changed default value
This commit is contained in:
Pierre Goiffon
2019-06-19 16:13:29 +02:00
parent 6f9f74e72f
commit db20244212
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/attributedef.class.inc.php
View File

@@ -512,7 +512,7 @@ abstract class AttributeDefinition
} }
/** /**
* @param string|null $sDefault * @param string|null $sDefault if null, will return the attribute code replacing "_" by " "
* *
* @return string * @return string
* *
@@ -6551,8 +6551,9 @@ class AttributeExternalField extends AttributeDefinition
*/ */
public function GetLabel($sDefault = null) public function GetLabel($sDefault = null)
{ {
$sLabel = parent::GetLabel(null); $sLabelDefaultValue = '';
if (!is_null($sLabel)) $sLabel = parent::GetLabel($sLabelDefaultValue);
if ($sLabelDefaultValue !== $sLabel)
{ {
return $sLabel; return $sLabel;
} }