FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 23:06:05 +00:00
Code Issues Releases Wiki Activity

bugfix : Variable $base bei publish leer annehmen falls nicht definiert

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17905 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister 2018-12-06 21:55:36 +00:00
parent b27925cd09
commit 4c2e9e514e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm
View File

@ -30,7 +30,10 @@
# #
# CHANGE LOG # CHANGE LOG
# #
# 25.11.018 1.0.3 # 06.12.2018 1.0.4
# bugfix : Variable $base bei publish leer annehmen falls nicht definiert
#
# 25.11.2018 1.0.3
# bugfix : Param name for IOWrite (subscribe) # bugfix : Param name for IOWrite (subscribe)
# #
# 21.11.018 1.0.2 # 21.11.018 1.0.2
@ -252,7 +255,7 @@ use warnings;
#my $DEBUG = 1; #my $DEBUG = 1;
my $cvsid = '$Id$'; my $cvsid = '$Id$';
my $VERSION = "version 1.0.3 by hexenmeister\n$cvsid"; my $VERSION = "version 1.0.4 by hexenmeister\n$cvsid";
my %sets = ( my %sets = (
); );
@ -1020,6 +1023,8 @@ sub getDevicePublishRecIntern($$$$$) {
# compute defaults # compute defaults
my $combined = computeDefaults($hash, 'pub:', $globalMap, $devMap, {'device'=>$dev,'reading'=>$reading,'name'=>$name,'mode'=>$mode}); my $combined = computeDefaults($hash, 'pub:', $globalMap, $devMap, {'device'=>$dev,'reading'=>$reading,'name'=>$name,'mode'=>$mode});
# $topic evaluieren (avialable vars: $device (device name), $reading (oringinal name), $name ($reading oder alias, if defined), defaults) # $topic evaluieren (avialable vars: $device (device name), $reading (oringinal name), $name ($reading oder alias, if defined), defaults)
$combined->{'base'} = '' unless defined $combined->{'base'}; # base leer anlegen wenn nicht definiert
if(defined($topic) and ($topic =~ m/^{.*}$/)) { if(defined($topic) and ($topic =~ m/^{.*}$/)) {
$topic = _evalValue2($hash->{NAME},$topic,{'topic'=>$topic,'device'=>$dev,'reading'=>$reading,'name'=>$name,%$combined}) if defined $topic; $topic = _evalValue2($hash->{NAME},$topic,{'topic'=>$topic,'device'=>$dev,'reading'=>$reading,'name'=>$name,%$combined}) if defined $topic;
} }