From b3d5203a17fcc6dc7f90ea7da725f2f16364015e Mon Sep 17 00:00:00 2001 From: damian-s Date: Sun, 21 Feb 2016 12:41:29 +0000 Subject: [PATCH] 98_DOIF.pm: fixed: safe comma git-svn-id: https://svn.fhem.de/fhem/trunk@10899 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_DOIF.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/98_DOIF.pm b/fhem/FHEM/98_DOIF.pm index b590f826d..48b42260e 100644 --- a/fhem/FHEM/98_DOIF.pm +++ b/fhem/FHEM/98_DOIF.pm @@ -111,7 +111,7 @@ GetBlockDoIf ($$) } } sub -GetCommand ($) +GetCommandDoIf ($) { my ($tailBlock) = @_; my $char; @@ -138,6 +138,8 @@ GetCommand ($) } if ($cmd eq "") { $cmd=$tailBlock; + } else { + $cmd=$cmd.$tailBlock } return ($cmd,""); } @@ -541,7 +543,7 @@ ParseCommandsDoIf($$$) return ($currentBlock,$err) if ($err); #$tailBlock=substr($tailBlock,pos($tailBlock)) if ($tailBlock =~ /^\s*,/g); } else { - ($currentBlock,$tailBlock)=GetCommand($tailBlock); + ($currentBlock,$tailBlock)=GetCommandDoIf($tailBlock); } if ($currentBlock ne "") { ($currentBlock,$err)=ReplaceAllReadingsDoIf($hash,$currentBlock,-1,$eval);