Show
Ignore:
Timestamp:
03/01/12 19:58:12 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 13741 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.10

........

r13741 | p_lindheimer | 2012-03-01 16:56:41 -0800 (Thu, 01 Mar 2012) | 1 line


fixes #5639 voicemail module should not change the context, the core_device_add will put in the proper nnn@device if not set since the proper contexts are sym linked to the device directories

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svn:mergeinfo changed from /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739 to /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741
    • Property svnmerge-integrated changed from /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

  • modules/branches/2.9/voicemail/functions.inc.php

    r12002 r13742  
    795795      'options' => $vmoptions 
    796796      ); 
    797     // Update $_REQUEST with 'devinfo_mailbox, so MWI works. 
    798     if (empty($_REQUEST['devinfo_mailbox'])) { 
    799       $_REQUEST['devinfo_mailbox']="$extension@$vmcontext"; 
    800     } 
    801797  } 
    802798  voicemail_saveVoicemail($uservm);