diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index b82a77d18..e1b0981f2 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -351,7 +351,7 @@ FW_Read($) my $pid; if(AttrVal($FW_wname, "plotfork", undef)) { # Process SVG rendering as a parallel process - return if(($arg =~ m/cmd=showlog/) && ($pid = fork)); + return if(($arg =~ m+$FW_ME/SVG_showLog+) && ($pid = fork)); } my $cacheable = FW_answerCall($arg); diff --git a/fhem/fhem.pl b/fhem/fhem.pl index 8b88936da..df4101c8d 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -871,13 +871,16 @@ devspec2array($) return $name; } - my @ret; + my (@ret, $isAttr); foreach my $l (split(",", $name)) { # List of elements my @names = sort keys %defs; my @res; foreach my $dName (split(":FILTER=", $name)) { - my ($n,$op,$re) = ("NAME","=",$dName); - ($n,$op,$re) = ($1,$2,$3) if($dName =~ m/^([^!]*)(=|!=)(.*)$/); + my ($n,$op,$re) = ("DEVICE","=",$dName); + if($dName =~ m/^([^!]*)(=|!=)(.*)$/) { + ($n,$op,$re) = ($1,$2,$3); + $isAttr = 1; # Compatibility: return "" instead of $name + } ($n,$op,$re) = ($1,"eval","") if($dName =~ m/^{(.*)}$/); @res=(); @@ -915,7 +918,7 @@ devspec2array($) } push @ret,@res; } - return $name if(!@ret); + return $name if(!@ret && !$isAttr); return @ret; }