[asterisk-commits] jpeeler: trunk r301048 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jan  7 13:58:52 2011
New Revision: 301048

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301048
Log:
Merged revisions 301047 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301047 | jpeeler | 2011-01-07 13:58:30 -0600 (Fri, 07 Jan 2011) | 15 lines
  
  Merged revisions 301046 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301046 | jpeeler | 2011-01-07 13:57:42 -0600 (Fri, 07 Jan 2011) | 8 lines
    
    Fix regression causing forwarding voicemails to not work with file storage.
    
    I had actually already fixed this in 295200 in 1.4 and thought it wasn't
    missing in the other branches for some reason.
    
    (closes issue #18358)
    Reported by: cabal95
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=301048&r1=301047&r2=301048
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Jan  7 13:58:52 2011
@@ -5224,12 +5224,20 @@
 	recipmsgnum = last_message_index(recip, todir) + 1;
 	if (recipmsgnum < recip->maxmsg - (imbox ? 0 : inprocess_count(vmu->mailbox, vmu->context, 0))) {
 		make_file(topath, sizeof(topath), todir, recipmsgnum);
-		/* If we are prepending a message for ODBC, then the message already
-		 * exists in the database, but we want to force copying from the
-		 * filesystem (since only the FS contains the prepend). */
-		copy_plain_file(frompath, topath);
-		STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL, NULL);
-		vm_delete(topath);
+#ifndef ODBC_STORAGE
+		if (EXISTS(fromdir, msgnum, frompath, chan->language)) {	
+			COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath);
+		} else {
+#endif
+			/* If we are prepending a message for ODBC, then the message already
+			 * exists in the database, but we want to force copying from the
+			 * filesystem (since only the FS contains the prepend). */
+			copy_plain_file(frompath, topath);
+			STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL, NULL);
+			vm_delete(topath);
+#ifndef ODBC_STORAGE
+		}
+#endif
 	} else {
 		ast_log(AST_LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context);
 		res = -1;