diff --git a/fhem/CHANGED b/fhem/CHANGED index 4607b57c8..17378a632 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: FB_CALLMONITOR: use cache first for reverse search - feature: 14_CUL_TCM97001: Add receiving for GT-WT-.. and Rubicson sensors - feature: 73_km200: Sounding changed from static list to automatic - feature: FHEMWEB: filter dialog for eventMonitor allows filtering for diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm index 9de86998f..c885b6dbf 100755 --- a/fhem/FHEM/72_FB_CALLMONITOR.pm +++ b/fhem/FHEM/72_FB_CALLMONITOR.pm @@ -480,16 +480,6 @@ FB_CALLMONITOR_reverseSearch($$) chomp $number; - # Using internal phonebook if available and enabled - if((grep { /^(all|phonebook|internal)$/ } @attr_list) and defined($hash->{helper}{PHONEBOOK})) - { - if(defined($hash->{helper}{PHONEBOOK}{$number})) - { - Log3 $name, 4, "FB_CALLMONITOR ($name) - using internal phonebook for reverse search of $number"; - return $hash->{helper}{PHONEBOOK}{$number}; - } - } - # Using Cache if enabled if(AttrVal($name, "reverse-search-cache", "0") eq "1") { @@ -502,6 +492,16 @@ FB_CALLMONITOR_reverseSearch($$) } } } + + # Using internal phonebook if available and enabled + if((grep { /^(all|phonebook|internal)$/ } @attr_list) and defined($hash->{helper}{PHONEBOOK})) + { + if(defined($hash->{helper}{PHONEBOOK}{$number})) + { + Log3 $name, 4, "FB_CALLMONITOR ($name) - using internal phonebook for reverse search of $number"; + return $hash->{helper}{PHONEBOOK}{$number}; + } + } # Ask klicktel.de if((grep { /^(all|klicktel\.de)$/ } @attr_list))