Backport part of revision 136715 to fix callerid in voicemail text files (IMAP only).

(closes issue #16945)
 Reported by: mneuhauser

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@272147 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 5be892d846c4cc37ec28c7092e7b7aad95e4d9be..d99c00d27d036ac7383892bb166f4ad3f62668f8 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1193,9 +1193,10 @@ static int imap_retrieve_file(const char *dir, const int msgnum, const struct as
 
        fprintf(text_file_ptr, "%s\n", "[message]");
 
-       cid_num = get_header_by_tag(header_content, "X-Asterisk-VM-Caller-ID-Num:");
        cid_name = get_header_by_tag(header_content, "X-Asterisk-VM-Caller-ID-Name:");
-       fprintf(text_file_ptr, "callerid=\"%s\" <%s>\n", S_OR(cid_name, ""), S_OR(cid_num, ""));
+       fprintf(text_file_ptr, "callerid=\"%s\" ", S_OR(cid_name, ""));
+       cid_num = get_header_by_tag(header_content, "X-Asterisk-VM-Caller-ID-Num:");
+       fprintf(text_file_ptr, "<%s>\n", S_OR(cid_num, ""));
        context = get_header_by_tag(header_content, "X-Asterisk-VM-Context:");
        fprintf(text_file_ptr, "context=%s\n", S_OR(context, ""));
        origtime = get_header_by_tag(header_content, "X-Asterisk-VM-Orig-time:");