Changeset 8038

Show
Ignore:
Timestamp:
08/10/09 23:07:52 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 8036-8037 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r8036 | p_lindheimer | 2009-08-10 19:58:51 -0700 (Mon, 10 Aug 2009) | 1 line


fixes #3804 use comma not pipe as option delimeter

........

r8037 | p_lindheimer | 2009-08-10 19:59:06 -0700 (Mon, 10 Aug 2009) | 1 line


Module Publish Script: announcement 2.5.1.9

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968 to /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968,8036-8037

  • modules/branches/2.6/announcement/functions.inc.php

    r7470 r8038  
    8686            $ext->add('app-announcement-'.$row['announcement_id'], 's', '', new ext_responsetimeout(1)); 
    8787          } 
    88           $ext->add('app-announcement-'.$row['announcement_id'], 's', 'play', new ext_background($recording.'|nm')); 
     88          $ext->add('app-announcement-'.$row['announcement_id'], 's', 'play', new ext_background($recording.',nm')); 
    8989          if ($row['repeat_msg']) { 
    9090            $ext->add('app-announcement-'.$row['announcement_id'], 's', '', new ext_waitexten('')); 

  • modules/branches/2.6/announcement/module.xml

    r7919 r8038  
    22  <rawname>announcement</rawname> 
    33  <name>Announcements</name> 
    4   <version>2.6.0.0</version> 
     4  <version>2.6.0.1</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    77  <changelog> 
     8    *2.6.0.1* #3804 
    89    *2.6.0.0* localizations, misc 
    910    *2.5.1.7* localization string enclosures, spelling