From 05e0d87f9fb789d2c24237b5748215c258c1668f Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 23 Apr 2013 10:55:08 +0000
Subject: [PATCH] Call detailFn and summaryFn with FW_wname instead of
FW_chash, consistent with webCmdFn.
git-svn-id: https://svn.fhem.de/fhem/trunk@3106 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/FHEM/01_FHEMWEB.pm | 4 ++--
fhem/FHEM/92_FileLog.pm | 2 +-
fhem/FHEM/98_weblink.pm | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index a11cd4a08..8d95a8963 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -798,7 +798,7 @@ FW_doDetail($)
if($modules{$t}{FW_detailFn}) {
no strict "refs";
- FW_pO &{$modules{$t}{FW_detailFn}}($FW_chash, $d, $FW_room) . "
";
+ FW_pO &{$modules{$t}{FW_detailFn}}($FW_wname, $d, $FW_room) . "
";
use strict "refs";
}
@@ -1062,7 +1062,7 @@ FW_showRoom()
if($modules{$type}{FW_summaryFn}) {
FW_pO "
";
no strict "refs";
- FW_pO &{$modules{$type}{FW_summaryFn}}($FW_chash, $d, $FW_room, \%extPage);
+ FW_pO &{$modules{$type}{FW_summaryFn}}($FW_wname,$d,$FW_room,\%extPage);
use strict "refs";
FW_pO " | ";
next;
diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm
index 326ced67b..9432d872e 100755
--- a/fhem/FHEM/92_FileLog.pm
+++ b/fhem/FHEM/92_FileLog.pm
@@ -170,7 +170,7 @@ FileLog_Set($@)
sub
FW_dumpFileLog($$$$)
{
- my ($FW_chash, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
+ my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
return "$defs{$d}{STATE}
"
if($FW_ss && $pageHash);
diff --git a/fhem/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm
index b683cfe23..b55278307 100755
--- a/fhem/FHEM/98_weblink.pm
+++ b/fhem/FHEM/98_weblink.pm
@@ -75,7 +75,7 @@ weblink_FwDetail($)
sub
weblink_FwFn($$$$)
{
- my ($FW_chash, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
+ my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
my $hash = $defs{$d};
my $link = $hash->{LINK};
my $wltype = $hash->{WLTYPE};