Changeset 4088

Show
Ignore:
Timestamp:
06/20/07 15:41:47 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743,3745,3747,3752-3753,3756,3758-3769,3771,3773-3774,3778-3793,3797,3799-3804,3807,3809-3825,3827-3829,3831-3836,3838-3845,3847,3850,3852-3856,3859-3869,3871,3873-3882,3884-3885,3887-3890,3892-3895,3897-3902,3904,3906,3908,3910-3916,3918,3920,3922-3927,3929-3932,3934,3936-3937,3939-3946,3948-3955,3957,3959,3964,3967,3969-3970,3972,3974-3977,3979-3980,3982-3994,3996-4001,4003-4005,4007-4010,4013-4014,4016-4017,4020-4051,4053-4054,4056-4084,4086-4087 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2

........

r4086 | p_lindheimer | 2007-06-20 12:39:05 -0700 (Wed, 20 Jun 2007) | 1 line


#1857: check if $astman is set first

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-3724,3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743-3745,3747,3752-3753,3755-3793,3797-4052 to /freepbx/branches/2.2:1-3724,3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743-3745,3747,3752-3753,3755-3793,3797-4054,4056-4087

  • freepbx/trunk/amp_conf/htdocs/admin/footer.php

    r3524 r4088  
    5656  } 
    5757   
    58   if ($astman) { 
     58  if (isset($astman) && $astman) { 
    5959    //run retrieve script 
    6060    $retrieve = $amp_conf['AMPBIN'].'/retrieve_conf';