Changeset 10296

Show
Ignore:
Timestamp:
09/22/10 11:59:28 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10295 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r10295 | p_lindheimer | 2010-09-22 08:53:43 -0700 (Wed, 22 Sep 2010) | 1 line


fixes #4551 namespace clash with IVR and VMBLAST messages

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264 /modules/branches/2.9:1-10122 to /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295 /modules/branches/2.9:1-10122

  • modules/branches/2.8/vmblast/functions.inc.php

    r8947 r10296  
    9595            } 
    9696            if (isset($recording_hash[$grp['audio_label']])) { 
    97               $ext->add($contextname, $grpnum, '', new ext_setvar('MSG',$recording_hash[$grp['audio_label']])); 
     97              $ext->add($contextname, $grpnum, '', new ext_setvar('VMBMSG',$recording_hash[$grp['audio_label']])); 
    9898              $ext->add($contextname, $grpnum, '', new ext_goto('msg','vmblast','app-vmblast')); 
    9999            } else { 
    …… 
    105105        $contextname = 'app-vmblast'; 
    106106        $ext->add($contextname, 'vmblast', 'digits', new ext_execif('$["${DIGITS}" != ""]','SayDigits','${DIGITS}')); 
    107         $ext->add($contextname, 'vmblast', 'msg', new ext_execif('$["${MSG}" != ""]','Background','${MSG}')); 
     107        $ext->add($contextname, 'vmblast', 'msg', new ext_execif('$["${VMBMSG}" != ""]','Background','${VMBMSG}')); 
    108108        $ext->add($contextname, 'vmblast', '', new ext_background('if-correct-press&digits/1')); 
    109109        $ext->add($contextname, 'vmblast', '', new ext_waitexten('20')); 

  • modules/branches/2.8/vmblast/module.xml

    r10094 r10296  
    22  <rawname>vmblast</rawname> 
    33  <name>VoiceMail Blasting</name> 
    4   <version>2.8.0.1</version> 
     4  <version>2.8.0.2</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1111  </description> 
    1212  <changelog> 
     13    *2.8.0.2* #4551 
    1314    *2.8.0.1* localization updates 
    1415    *2.8.0.0* #4309, #4310