Show
Ignore:
Timestamp:
01/15/10 11:03:45 (2 years ago)
Author:
mickecarlsson
Message:

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

................

r8622 | mickecarlsson | 2010-01-15 17:53:48 +0100 (Fri, 15 Jan 2010) | 9 lines


Merged revisions 8620 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6


........

r8620 | mickecarlsson | 2010-01-15 12:06:43 +0100 (Fri, 15 Jan 2010) | 1 line


re r8613 add missing global

........

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875,7878,7886,7890,8615 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875,7878,7886,7890,8615,8622

  • modules/branches/2.4/core/functions.inc.php

    r8616 r8624  
    16061606 
    16071607function core_did_get($extension="",$cidnum=""){ 
     1608  global $db; 
    16081609  $cidnum = $db->escapeSimple($cidnum); 
    16091610  $sql = "SELECT * FROM incoming WHERE cidnum = \"$cidnum\" AND extension = \"$extension\""; 
    …… 
    16121613 
    16131614function core_did_del($extension,$cidnum){ 
     1615  global $db; 
    16141616  $cidnum = $db->escapeSimple($cidnum); 
    16151617  $sql="DELETE FROM incoming WHERE cidnum = \"$cidnum\" AND extension = \"$extension\"";