2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 01:06:04 +00:00

summaryFn is ignored if the return value is undef

git-svn-id: https://svn.fhem.de/fhem/trunk@3140 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-04-30 11:19:18 +00:00
parent c766d53f12
commit 05c32845df

View File

@ -778,7 +778,8 @@ FW_doDetail($)
if($modules{$t}{FW_detailFn}) {
no strict "refs";
FW_pO &{$modules{$t}{FW_detailFn}}($FW_wname, $d, $FW_room) . "<br>";
my $txt = &{$modules{$t}{FW_detailFn}}($FW_wname, $d, $FW_room);
FW_pO "$txt<br>" if(defined($txt));
use strict "refs";
}
@ -1069,11 +1070,15 @@ FW_showRoom()
my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf);
my $sfn = $modules{$type}{FW_summaryFn};
my $newtxt;
if($sfn) {
no strict "refs";
$txt = &{$sfn}($FW_wname, $d, $FW_room, \%extPage);
my $newtxt = &{$sfn}($FW_wname, $d, $FW_room, \%extPage);
use strict "refs";
FW_pO "<td id=\"$type.$d\">$txt</td>";
}
if(defined($newtxt)) {
FW_pO "<td id=\"$type.$d\">$newtxt</td>";
} else {
FW_pO "<td id=\"$d\">$txt</td>";