Changeset 7881

Show
Ignore:
Timestamp:
06/29/09 22:02:08 (3 years ago)
Author:
p_lindheimer
Message:

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

........

r7878 | p_lindheimer | 2009-06-29 19:36:32 -0700 (Mon, 29 Jun 2009) | 1 line


fixes #3741 added new function core_routing_trunk_del(trunknum) which deletes the specified trunk from all routes

........

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 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

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

    r6364 r7881  
    36513651} 
    36523652 
     3653/* Delete all occurences of the specified trunk from all routes that may use it 
     3654 */ 
     3655function core_routing_trunk_del($trunknum) { 
     3656  global $db; 
     3657 
     3658  $sql = "DELETE FROM `extensions` WHERE `application` = 'Macro' AND `context` LIKE 'outrt-%' AND `args` LIKE 'dialout-%,$trunknum,%'"; 
     3659  $result = $db->query($sql); 
     3660} 
     3661 
    36533662function core_routing_rename($oldname, $newname) { 
    36543663  global $db; 

  • modules/branches/2.4/core/page.trunks.php

    r5744 r7881  
    9595   
    9696    core_trunks_del($trunknum); 
     97    core_routing_trunk_del($trunknum); 
    9798     
    9899    /* //DIALRULES