Changeset 7866

Show
Ignore:
Timestamp:
06/23/09 13:23:02 (1 year ago)
Author:
p_lindheimer
Message:

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

........

r7812 | mickecarlsson | 2009-06-10 14:39:39 -0700 (Wed, 10 Jun 2009) | 1 line


Closes #3713 adds Russian language to weakpasswords. Thank you ded

........

r7854 | fskrotzki | 2009-06-20 19:53:20 -0700 (Sat, 20 Jun 2009) | 1 line


Fixes #3732 by removing the system context of zonemessages from the selection list

........

r7858 | p_lindheimer | 2009-06-23 10:15:37 -0700 (Tue, 23 Jun 2009) | 1 line


fixes #3734 set FORWARD_CONTEXT before paging to block client side CF

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7806 to /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7609-7622,7786

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

    r7674 r7866  
    22        <rawname>ivr</rawname> 
    33        <name>IVR</name> 
    4         <version>2.6.0.0</version> 
     4        <version>2.6.0.1</version> 
    55        <type>setup</type> 
    66        <category>Inbound Call Control</category> 
    …… 
    99        </description> 
    1010        <changelog> 
     11                *2.6.0.1* #3732 
    1112                *2.6.0.0* #3384, add hook support 
    1213                *2.5.20.5* localization string enclosures 

  • modules/branches/2.6/ivr/page.ivr.php

    r7854 r7866  
    207207                                        $vmcontexts = array_keys($vm_results); 
    208208                                        foreach ($vmcontexts as $vmc) { 
    209                                                 if ($vmc != 'general') && ($vmc != 'zonemessages)  
     209                                                if (($vmc != 'general') && ($vmc != 'zonemessages')) { 
    210210                                                        echo '<option value="'.$vmc.'"'.($vmc == $ivr_details['dircontext'] ? ' SELECTED' : '').'>'.$vmc."</option>\n"; 
    211                                                 } 
     211            } 
     212                                        } 
    212213                                        ?> 
    213214                                </select>