mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

summaryFn is ignored if the return value is undef

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3140 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-04-30 11:19:18 +00:00
parent d680190110
commit 9e63077174
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/01_FHEMWEB.pm
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>";