Show
Ignore:
Timestamp:
02/04/07 17:19:30 (6 years ago)
Author:
naftali5
Message:

Merged revisions 3696 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r3696 | naftali5 | 2007-02-04 17:17:46 -0500 (Sun, 04 Feb 2007) | 1 line


keep rtone from being set in queues_additional.conf #1635

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.2

    • Property svnmerge-integrated changed from /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3437,3567,3614-3622,3624,3688 to /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3437,3567,3614-3622,3624,3688,3696

  • freepbx/branches/2.2/amp_conf/bin/retrieve_queues_conf_from_mysql.pl

    r3195 r3697  
    100100  my $id = @{ $row }[1]; 
    101101  print EXTEN "[$account]\n"; 
    102   $statement = "SELECT keyword,data from $table_name where id=$id and keyword <> 'account' order by flags"; 
     102  $statement = "SELECT keyword,data from $table_name where id=$id and keyword <> 'account' and keyword <> 'rtone' order by flags"; 
    103103  my $result = $dbh->selectall_arrayref($statement); 
    104104  unless ($result) {