Changeset 5295

Show
Ignore:
Timestamp:
11/26/07 19:23:45 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5294 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5294 | p_lindheimer | 2007-11-26 16:21:35 -0800 (Mon, 26 Nov 2007) | 1 line


#2517 quote in case we allow non-numeric devices

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.3

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122,5124,5132,5151,5153,5215,5235,5247 to /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122,5124,5132,5151,5153,5215,5235,5247,5294

  • freepbx/branches/2.3/amp_conf/bin/libfreepbx.confgen.php

    r5236 r5295  
    7070    fwrite($sip_conf_fh,"[$account]\n"); 
    7171 
    72     $sql = "SELECT keyword,data from $table_name where id=$id and keyword <> 'account' and flags <> 1 order by keyword DESC"; 
     72    $sql = "SELECT keyword,data from $table_name where id='$id' and keyword <> 'account' and flags <> 1 order by keyword DESC"; 
    7373    $results2 = $db->getAll($sql, DB_FETCHMODE_ASSOC); 
    7474    if(DB::IsError($results2)) {