Fix misspelling of macro args.
authorMark Michelson <mmichelson@digium.com>
Wed, 26 May 2010 20:04:51 +0000 (20:04 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 26 May 2010 20:04:51 +0000 (20:04 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@266092 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c
res/res_musiconhold.c

index 1dbe112..999e39b 100644 (file)
@@ -7882,7 +7882,7 @@ int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struc
                ? "CONNECTED_LINE_CALLER_SEND_MACRO" : "CONNECTED_LINE_CALLEE_SEND_MACRO");
        macro = ast_strdupa(S_OR(macro, ""));
        macro_args = pbx_builtin_getvar_helper(macro_chan, is_caller
-               ? "CONNECTED_LINE_CALLER_SEND_MACRO_ARSG" : "CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS");
+               ? "CONNECTED_LINE_CALLER_SEND_MACRO_ARGS" : "CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS");
        macro_args = ast_strdupa(S_OR(macro_args, ""));
        ast_channel_unlock(macro_chan);
 
index 4d2c9ec..5527109 100644 (file)
@@ -1443,6 +1443,10 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
                }
        }
 
+       if (ast_test_flag(global_flags, MOH_CACHERTCLASSES)) {
+               mohclass = get_mohbyname(mohclass->name, 0);
+       }
+
        if (!mohclass) {
                return -1;
        }