Merged revisions 306962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r306962 | jpeeler | 2011-02-08 13:25:38 -0600 (Tue, 08 Feb 2011) | 22 lines Merged revisions 306961 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r306961 | jpeeler | 2011-02-08 13:25:10 -0600 (Tue, 08 Feb 2011) | 15 lines Merged revisions 306960 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r306960 | jpeeler | 2011-02-08 13:18:50 -0600 (Tue, 08 Feb 2011) | 9 lines Backup file storing message duration is not used with IMAP_STORAGE, remove code. The message duration is stored in the body of the email when using IMAP_STORAGE, so nothing needs to happen with the backup file. (closes issue #18718) Reported by: kerframil ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@306963 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
924f99c3c4
commit
fb853d079b
|
@ -6767,14 +6767,16 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
|
|||
}
|
||||
|
||||
/* Back up the original file, so we can retry the prepend and restore it after forward. */
|
||||
#ifndef IMAP_STORAGE
|
||||
if (already_recorded) {
|
||||
ast_filecopy(backup, msgfile, NULL);
|
||||
copy(backup_textfile, textfile);
|
||||
}
|
||||
else {
|
||||
ast_filecopy(msgfile, backup, NULL);
|
||||
copy(textfile,backup_textfile);
|
||||
copy(textfile, backup_textfile);
|
||||
}
|
||||
#endif
|
||||
already_recorded = 1;
|
||||
|
||||
if (record_gain)
|
||||
|
|
Reference in New Issue