Changeset 13865

Show
Ignore:
Timestamp:
03/22/12 18:37:25 (1 year ago)
Author:
p_lindheimer
Message:

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

........

r13864 | p_lindheimer | 2012-03-22 15:33:29 -0700 (Thu, 22 Mar 2012) | 1 line


incorrect logic re #5705

........

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,13478,13730,13737,13739,13741,13773,13845 to /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473,13478,13730,13737,13739,13741,13773,13845,13864
    • 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,13478,13730,13737,13739,13741,13773,13845 /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,13730,13737,13739,13741,13773,13845,13864 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

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

    r11780 r13865  
    538538  $ccss['cc_offer_timer'] =       isset($_REQUEST['cc_offer_timer']) ? $_REQUEST['cc_offer_timer'] : $amp_conf['CC_OFFER_TIMER_DEFAULT']; 
    539539 
    540   if ($action == 'add' || $action == 'edit' && !$amp_conf['CC_FORCE_DEFAULTS']) { 
     540  if (($action == 'add' || $action == 'edit') && !$amp_conf['CC_FORCE_DEFAULTS']) { 
    541541    $ccss['ccbs_available_timer'] = isset($_REQUEST['ccbs_available_timer']) ? $_REQUEST['ccbs_available_timer'] : $amp_conf['CCBS_AVAILABLE_TIMER_DEFAULT']; 
    542542    $ccss['ccnr_available_timer'] = isset($_REQUEST['ccnr_available_timer']) ? $_REQUEST['ccnr_available_timer'] : $amp_conf['CCNR_AVAILABLE_TIMER_DEFAULT'];