diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-05 18:22:56 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-05 18:22:56 +0000 |
| commit | 092e1d3bef5c693dac0d657233b96199ba97b53d (patch) | |
| tree | b0032d03fcee82f2b8698095e0837b9c66f82736 | |
| parent | 37f511aad00be2fa95f0a154da467cc3154ff83f (diff) | |
Add regression fix to release candidate
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.18-rc2@250976 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -2,6 +2,15 @@ * Asterisk 1.6.1.18-rc2 released +2010-03-05 Tilghman Lesher <tlesher@digium.com> + + * /, apps/app_voicemail.c: Merged revisions 250913 via svnmerge from + https://origsvn.digium.com/svn/asterisk/trunk ........ r250913 | tilghman + | 2010-03-04 22:37:36 -0600 (Thu, 04 Mar 2010) | 7 lines Missing quote in + ODBC query. (closes issue #16953) Reported by: elguero Patches: + app_voicemail-odbc-syntax-fix.diff uploaded by elguero (license 37) + ........ + 2010-03-04 Leif Madsen <lmadsen@digium.com> * Asterisk 1.6.1.18-rc1 released diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index a61599279..c90086453 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -4686,7 +4686,7 @@ static int messagecount(const char *context, const char *mailbox, const char *fo obj = ast_odbc_request_obj(odbc_database, 0); if (obj) { if (!strcmp(folder, "INBOX")) { - snprintf(sql, sizeof(sql), "SELECT COUNT(*) FROM %s WHERE dir = '%s%s/%s/INBOX' OR dir = '%s%s/%s/Urgent", odbc_table, VM_SPOOL_DIR, context, mailbox, VM_SPOOL_DIR, context, mailbox); + snprintf(sql, sizeof(sql), "SELECT COUNT(*) FROM %s WHERE dir = '%s%s/%s/INBOX' OR dir = '%s%s/%s/Urgent'", odbc_table, VM_SPOOL_DIR, context, mailbox, VM_SPOOL_DIR, context, mailbox); } else { snprintf(sql, sizeof(sql), "SELECT COUNT(*) FROM %s WHERE dir = '%s%s/%s/%s'", odbc_table, VM_SPOOL_DIR, context, mailbox, folder); } |