kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documents CHANNEL(musicclass) taking priority over m([x]) in waitExten

Browse Source 
If waitExten specifies a music class to use with its music on hold option, it will use
CHANNEL(musicclass) instead if that channel variable has been set on the initiating
channel.  This documents that behavior in the waitExten app so that this can be known
without checking the documentation of the code in function local_ast_moh_start.

(closes issue ASTERISK-18804)
........

Merged revisions 347239 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 347240 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-12-06 22:01:00 +00:00
parent fd64bb66f9
commit 9b33408ba1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/pbx.c
View File

@@ -671,7 +671,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<option name="m"> <option name="m">
<para>Provide music on hold to the caller while waiting for an extension.</para> <para>Provide music on hold to the caller while waiting for an extension.</para>
<argument name="x"> <argument name="x">
<para>Specify the class for music on hold.</para> <para>Specify the class for music on hold. <emphasis>CHANNEL(musicclass) will
be used instead if set</emphasis></para>
</argument> </argument>
</option> </option>
</optionlist> </optionlist>