Changeset 13479

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

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

    • Property svn:mergeinfo changed from /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473 to /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478
    • Property svnmerge-integrated changed from /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473,13478 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

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

    r9477 r13479  
    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']);