]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 218579 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 15 Sep 2009 16:05:25 +0000 (16:05 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 15 Sep 2009 16:05:25 +0000 (16:05 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218579 | tilghman | 2009-09-15 11:04:41 -0500 (Tue, 15 Sep 2009) | 16 lines

  Merged revisions 218577 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r218577 | tilghman | 2009-09-15 11:01:17 -0500 (Tue, 15 Sep 2009) | 9 lines

    Ensure FollowMe sets language in channels it creates.
    Also, not in the original bug report, but related fields are accountcode and
    musicclass, and the inheritance of datastores.
    (closes issue #15372)
     Reported by: Romik
     Patches:
           20090828__issue15372.diff.txt uploaded by tilghman (license 14)
     Tested by: cervajs
  ........
................

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

apps/app_followme.c

index 1b15c13c3a88945f1f775b33e3aae26f218d6fab..21e5c549a70f1db4aa713a970c5cd007a8516f14 100644 (file)
@@ -795,6 +795,10 @@ static void findmeexec(struct fm_args *tpargs)
                        if (outbound) {
                                ast_set_callerid(outbound, caller->cid.cid_num, caller->cid.cid_name, caller->cid.cid_num);
                                ast_channel_inherit_variables(tpargs->chan, outbound);
+                               ast_channel_datastore_inherit(tpargs->chan, outbound);
+                               ast_string_field_set(outbound, language, tpargs->chan->language);
+                               ast_string_field_set(outbound, accountcode, tpargs->chan->accountcode);
+                               ast_string_field_set(outbound, musicclass, tpargs->chan->musicclass);
                                ast_verb(3, "calling %s\n", dialarg);
                                if (!ast_call(outbound,dialarg,0)) {
                                        tmpuser->ochan = outbound;