Changeset 7764

Show
Ignore:
Timestamp:
05/27/09 19:22:25 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7763 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7763 | p_lindheimer | 2009-05-27 16:20:18 -0700 (Wed, 27 May 2009) | 1 line


sort order vmblast groups, re #3697

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7758,7761 to /modules/branches/2.5:1-7758,7761,7763

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

    r7250 r7764  
    123123    return $extenlist; 
    124124  } 
    125   $sql = "SELECT grpnum ,description FROM vmblast "; 
     125  $sql = "SELECT grpnum, description FROM vmblast "; 
    126126  if (is_array($exten)) { 
    127127    $sql .= "WHERE grpnum in ('".implode("','",$exten)."')"; 
    128128  } 
     129  $sql .= " ORDER BY CAST(grpnum AS UNSIGNED)"; 
    129130  $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC); 
    130131 

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

    r7276 r7764  
    99  </description> 
    1010  <changelog> 
     11    *2.5.0.6* #3697 
     12    *2.5.0.5* localization updates 
    1113    *2.5.0.4* #3380 
    1214    *2.5.0.3* localization string enclosures