Fix Bug #625: Voicemail with PostgreSQL backend called with no context puts msgs in

wrong place

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index dc8dbdec857f957ba12ed23304f028c74165ef9f..7be3152e88fdb3806d76d790ae06f2bafa634922 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -287,12 +287,8 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
                {
                        strcpy(retval->context, "default");
                }
-
-               if (*retval->context) {
-                       sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='%s' AND mailbox='%s'", context, mailbox);
-               } else {
-                       sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='default' AND mailbox='%s'", mailbox);
-               }
+               sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='%s' AND mailbox='%s'", retval->context, mailbox);
+               
 /*     fprintf(stderr,"postgres find_user: query = %s\n",query); */
                ast_mutex_lock(&postgreslock);
                PGSQLres=PQexec(dbhandler,query);