[svn-commits] tilghman: tag 1.6.2.6-rc2 r250977 - in /tags/1.6.2.6-rc2: ./ apps/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Mar  5 12:27:33 2010
New Revision: 250977

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250977
Log:
Merge regression fix to release candidate.

Modified:
    tags/1.6.2.6-rc2/   (props changed)
    tags/1.6.2.6-rc2/ChangeLog
    tags/1.6.2.6-rc2/apps/app_voicemail.c

Propchange: tags/1.6.2.6-rc2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: tags/1.6.2.6-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.6-rc2/ChangeLog?view=diff&rev=250977&r1=250976&r2=250977
==============================================================================
--- tags/1.6.2.6-rc2/ChangeLog (original)
+++ tags/1.6.2.6-rc2/ChangeLog Fri Mar  5 12:27:33 2010
@@ -1,6 +1,15 @@
 2010-03-05  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.6.2.6-rc2 released
+
+2010-03-05  Tilghman Lesher <tlesher at 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 at digium.com>
 

Modified: tags/1.6.2.6-rc2/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.6-rc2/apps/app_voicemail.c?view=diff&rev=250977&r1=250976&r2=250977
==============================================================================
--- tags/1.6.2.6-rc2/apps/app_voicemail.c (original)
+++ tags/1.6.2.6-rc2/apps/app_voicemail.c Fri Mar  5 12:27:33 2010
@@ -4811,7 +4811,7 @@
 	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);
 		}