Changeset 13480

Show
Ignore:
Timestamp:
02/19/12 12:20:28 (1 year ago)
Author:
p_lindheimer
Message:

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

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

r13479 | p_lindheimer | 2012-02-19 09:18:47 -0800 (Sun, 19 Feb 2012) | 9 lines


Merged revisions 13478 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.10


........

r13478 | p_lindheimer | 2012-02-19 09:17:18 -0800 (Sun, 19 Feb 2012) | 1 line


fixes #5597 don't unset the pinset id just before trying to use it :)

........

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svn:mergeinfo set to
      /modules/branches/2.10:13478
      /modules/branches/2.9:13479
    • 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,11907-11908,11933,12048,13057 /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,11933,12048,13057,13479

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

    r9477 r13480  
    275275    // 
    276276    if (!$action && isset($_SESSION['pinsetsAddRoute']) && $_SESSION['pinsetsAddRoute'] != '') { 
     277      pinsets_adjustroute($route_id,'delayed_insert_route',$_SESSION['pinsetsAddRoute']); 
    277278      unset($_SESSION['pinsetsAddRoute']); 
    278       pinsets_adjustroute($route_id,'delayed_insert_route',$_SESSION['pinsetsAddRoute']); 
    279279    } elseif ($action){ 
    280280      pinsets_adjustroute($route_id,$action,$request['pinsets']);