aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--apps/app_voicemail.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fab451315..b463bf845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
* Asterisk 1.6.2.6-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.2.6-rc1 released
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index f47a6a60d..1897c9c82 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4811,7 +4811,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);
}