From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 23 Jun 2010 18:40:28 +0000 (+0000)
Subject: Backport part of revision 136715 to fix callerid in voicemail text files (IMAP only).
X-Git-Tag: 1.4.34-rc1~2^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28e9afee31ab472cf1d793e31b550da84c686a71;p=thirdparty%2Fasterisk.git

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 5be892d846..d99c00d27d 100644
--- 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:");