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

Merge fix on previous change (fixed #473, but getting a warning)

Browse Source 
SVN:1.2[1585]
This commit is contained in:
Romain Quetiez
2011-09-19 11:49:43 +00:00
parent ca4dbd833c
commit 619252db99
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2729,19 +2729,19 @@ class AttributeExternalField extends AttributeDefinition
}
}
public function GetLabel()
public function GetLabel($sDefault = '')
{
$oRemoteAtt = $this->GetExtAttDef();
$sDefault = $oRemoteAtt->GetLabel();
return parent::GetLabel($sDefault);
}
public function GetDescription()
public function GetDescription($sDefault = '')
{
$oRemoteAtt = $this->GetExtAttDef();
$sDefault = $oRemoteAtt->GetDescription();
return parent::GetDescription($sDefault);
}
public function GetHelpOnEdition()
public function GetHelpOnEdition($sDefault = '')
{
$oRemoteAtt = $this->GetExtAttDef();
$sDefault = $oRemoteAtt->GetHelpOnEdition();