Changeset 9112

Show
Ignore:
Timestamp:
03/10/10 12:55:59 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9107 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8

........

r9107 | mickecarlsson | 2010-03-09 23:04:52 -0800 (Tue, 09 Mar 2010) | 1 line


Fixes #4120, CID prefix mixed up with agent prefix

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672 /modules/branches/2.8:1-9044 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672 /modules/branches/2.8:1-9044,9107

  • modules/branches/2.7/queues/module.xml

    r8977 r9112  
    22  <rawname>queues</rawname> 
    33  <name>Queues</name> 
    4   <version>2.7.0.0</version> 
     4  <version>2.7.0.1</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1111  </description> 
    1212  <changelog> 
     13    *2.7.0.1* #4120, spelling typo 
    1314    *2.7.0.0* #4084, spelling, tooltips changes, localizations 
    1415    *2.7.0beta1.5* #4084, #4068 (support for experimental dial-one) 

  • modules/branches/2.7/queues/page.queues.php

    r9105 r9112  
    189189      switch ($matches[1]) { 
    190190        case 'Agent': 
    191           $prefix = 'A'; 
     191          $exten_prefix = 'A'; 
    192192          break; 
    193193        case 'SIP': 
    194           $prefix = 'S'; 
     194          $exten_prefix = 'S'; 
    195195          break; 
    196196        case 'IAX2': 
    197           $prefix = 'X'; 
     197          $exten_prefix = 'X'; 
    198198          break; 
    199199        case 'ZAP': 
    200           $prefix = 'Z'; 
     200          $exten_prefix = 'Z'; 
    201201          break; 
    202202        case 'DAHDI': 
    203           $prefix = 'D'; 
     203          $exten_prefix = 'D'; 
    204204          break; 
    205205        case 'Local': 
    206           $prefix = ''; 
     206          $exten_prefix = ''; 
    207207          break; 
    208208      } 
    209       $mem_array[] = $prefix.$matches[2].','.$matches[3]; 
     209      $mem_array[] = $_exten_prefix.$matches[2].','.$matches[3]; 
    210210    } 
    211211  }