Merged revisions 228196 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r228196 | tilghman | 2009-11-05 16:12:45 -0600 (Thu, 05 Nov 2009) | 2 lines

  Yet another error message in the dialplan (thanks, rmudgett/russellb)
........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6d6923ad545e0da8f63aeb900f7252568eeae1a3..0268554aca7a48a941e28eb4fb147ad821505fc3 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -5821,7 +5821,8 @@ static int acf_meetme_info(struct ast_channel *chan, const char *cmd, char *data
        if (result > -1) {
                snprintf(buf, len, "%d", result);
        } else if (result == -1) {
-               snprintf(buf, len, "%s %s", "Error: invalid keyword:", args.keyword);
+               ast_log(LOG_NOTICE, "Error: invalid keyword: '%s'\n", args.keyword);
+               snprintf(buf, len, "0");
        } else if (result == -2) {
                ast_log(LOG_NOTICE, "Error: conference (%s) not found\n", args.confno); 
                snprintf(buf, len, "0");