Changeset 2162

Show
Ignore:
Timestamp:
07/25/06 07:01:36 (7 years ago)
Author:
qldrob
Message:

Merge in 2.1 fixes to 2.2 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.2

    • Property svnmerge-integrated changed from /modules/branches/2.1:1-2014 to /modules/branches/2.1:1-2161

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

    r1792 r2162  
    3939  $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1) 
    4040  $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid) 
    41   $ext->add($id, $c, '', new ext_macro('get-vmcontext','${CALLERID(num)}'));  
     41  $ext->add($id, $c, '', new ext_macro('get-vm-context','${CALLERID(num)}'));  
    4242  $ext->add($id, $c, '', new ext_vmmain('${CALLERID(num)}@${VMCONTEXT}')); // n,VoiceMailMain(${VMCONTEXT}) 
    4343  $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid) 

  • modules/branches/2.2/voicemail/module.xml

    r1863 r2162  
    22  <rawname>voicemail</rawname> 
    33  <name>Voicemail</name> 
    4   <version>1.0</version> 
     4  <version>1.1</version> 
    55  <type>setup</type> 
    66  <category>Messaging</category> 
    7   <location>release/voicemail-1.0.tgz</location> 
     7  <location>release/voicemail-1.1.tgz</location> 
    88  <info>http://aussievoip.com.au/wiki/freePBX-Features</info> 
    9   <md5sum>4d1fb5a4a707bbb8862956270eeb33ec</md5sum> 
     9  <md5sum>b694662c8927f904552f836eb5320ceb</md5sum> 
    1010</module>