Show
Ignore:
Timestamp:
03/23/11 19:39:51 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11907-11908 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.9

........

r11907 | p_lindheimer | 2011-03-23 16:33:10 -0700 (Wed, 23 Mar 2011) | 1 line


fixes #5006 delete emergency_cid in astdb when removed in extension/device screen

........

r11908 | p_lindheimer | 2011-03-23 16:37:22 -0700 (Wed, 23 Mar 2011) | 1 line


remove spaces from emergency_cid re #5006

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.9:1-10122,10411-10428,10430-10440,10442-10444,10447,10449-10451,10453-10510,10512-10526,10529-10533,10536-10539,10542-10543,10545-10549,10556-10564,10572-10576,10578-10581,10597-10599,10602,10605,10607,10611,10658,10690,10771,11295,11327,11370,11496-11498,11502,11504,11506-11507,11509-11512,11515-11516,11519,11522-11535,11540,11543,11555-11556,11558-11562,11565-11570,11610 /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355,10399-10422,10424-10426,10428-10430,10432-10433,10436-10458,10628,10802,10816,10823,10869,10875-10876 to /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355,10399-10422,10424-10426,10428-10430,10432-10433,10436-10458,10628,10802,10816,10823,10869,10875-10876 /modules/branches/2.9:1-10122,10411-10428,10430-10440,10442-10444,10447,10449-10451,10453-10510,10512-10526,10529-10533,10536-10539,10542-10543,10545-10549,10556-10564,10572-10576,10578-10581,10597-10599,10602,10605,10607,10611,10658,10690,10771,11295,11327,11370,11496-11498,11502,11504,11506-11507,11509-11512,11515-11516,11519,11522-11535,11540,11543,11555-11556,11558-11562,11565-11570,11610,11907-11908

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

    r11378 r11909  
    35093509  } 
    35103510   
     3511  $emergency_cid = trim($emergency_cid); 
    35113512  if(!get_magic_quotes_gpc()) { 
    35123513    if(!empty($emergency_cid)) 
    …… 
    35393540    if($emergency_cid != '') { 
    35403541      $astman->database_put("DEVICE",$id."/emergency_cid","\"".$emergency_cid."\""); 
    3541     } 
     3542    } else { 
     3543      $astman->database_del("DEVICE",$id."/emergency_cid"); 
     3544    } 
    35423545 
    35433546    if ($user != "none") {