Changeset 9115

Show
Ignore:
Timestamp:
03/10/10 13:15:05 (3 years ago)
Author:
p_lindheimer
Message:

fixes #4109, fixes #3375 (regressed) merge r9108, r9109, r9110 from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.7/amp_conf/htdocs/admin/views/freepbx_admin.php

    r8599 r9115  
    140140    if (!isset($_COOKIE['lang'])) { 
    141141      $_COOKIE['lang'] = "en_US"; 
    142     }  
     142    } else { 
     143        setcookie("lang", $_COOKIE['lang'], time()+365*24*60*60); 
     144        } 
    143145?> 
    144146    

  • freepbx/branches/2.7/amportal.conf

    r8843 r9115  
    274274# if not specified it will default to mohmp3 for backward compatibility. 
    275275MOHDIR=moh 
     276 
     277# RELOADCONFIRM=true|false 
     278# DEFAULT VALUE: true 
     279# When set to false, will by-pass the confirm on Relaod Box 
     280 
     281# FCBEEPONLY=true|false 
     282# DEFAULT VALUE: false 
     283# When set to true, a beep is played instead of confirmation message when activating/de-activating: 
     284# CallForward, CallWaiting, DayNight, DoNotDisturb and FindMeFollow