From f399e4921788f71b4397789bf7b47f53256cec38 Mon Sep 17 00:00:00 2001 From: viegener Date: Sun, 12 Apr 2020 19:42:14 +0000 Subject: [PATCH] 50_TelegramBot: parsemode corrected for multiple lines - msg1041326 git-svn-id: https://svn.fhem.de/fhem/trunk@21652 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/50_TelegramBot.pm | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 3e12f037a..53e23f831 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. + - bugfix: 50_TelegramBot: parsemode corrected for multiple lines - msg1041326 - change: 37_echodevice.pm more loginformations set "NPM_login new" - change: 93_Log2Syslog: new reading 'Parse_Err_LastData', minor changes - change: 93_Log2Syslog: some code changes and reviews diff --git a/fhem/FHEM/50_TelegramBot.pm b/fhem/FHEM/50_TelegramBot.pm index 8acc572ff..71326bbec 100644 --- a/fhem/FHEM/50_TelegramBot.pm +++ b/fhem/FHEM/50_TelegramBot.pm @@ -169,6 +169,9 @@ # Corrected Eol # 2.9 2019-05-23 allow \s, addtl silenCmds, fixes +# FIX: correct parsemodesend for inMsg with multiple lines - msg1041326 +# +# # ############################################################################## # TASKS @@ -1778,10 +1781,10 @@ sub TelegramBot_SendIt($$$$$;$$$) $parseMode = "HTML"; } elsif ( $parseMode == 3 ) { $parseMode = 0; - if ( $msg =~ /^markdown(.*)$/i ) { + if ( $msg =~ /^markdown(.*)$/is ) { $msg = $1; $parseMode = "Markdown"; - } elsif ( $msg =~ /^HTML(.*)$/i ) { + } elsif ( $msg =~ /^HTML(.*)$/is ) { $msg = $1; $parseMode = "HTML"; }