Ignore:
Timestamp:
10/08/13 16:20:46 (11 years ago)
Author:
douglas
Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/zpush/config.php

    r8169 r8232  
    284284    $row = pg_fetch_assoc( $rs ); 
    285285 
    286     $smtpConfig = parse_ini_file(EXPRESSO_PATH . '/prototype/config/SMTP.srv' , true );  
    287     $GLOBALS['config']['SMTP'] = $smtpConfig['config'];  
    288   
     286    $smtpConfig = parse_ini_file(EXPRESSO_PATH . '/prototype/config/SMTP.srv' , true ); 
     287    $GLOBALS['config']['SMTP'] = $smtpConfig['config']; 
     288 
    289289    // ************************ 
    290290    //  BackendIMAP settings 
     
    314314    define('IMAP_USE_IMAPMAIL', false); 
    315315 
    316     define('CALENDAR_SYNC_SIGNED_CALENDARS', false);  
     316    define('CALENDAR_SYNC_SIGNED_CALENDARS', false); 
    317317 
    318318    $rs = pg_query( $GLOBALS['connections']['db'], 'SELECT app_id FROM phpgw_applications WHERE app_name = \'zpush\'' ); 
Note: See TracChangeset for help on using the changeset viewer.