Show
Ignore:
Timestamp:
03/20/08 19:36:54 (9 months ago)
Author:
mdawaffe
Message:

don't include l10n stuff if WP is already loaded. Fixes #837 for branches/0.8

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/0.8/bb-settings.php

    r1352 r1362  
    7676if ( !defined('BB_LANG') && defined('BBLANG') && '' != BBLANG ) // User has set old constant 
    7777        define('BB_LANG', BBLANG); 
    78 if ( defined('BB_LANG') && '' != BB_LANG ) { 
    79         include_once(BB_PATH . BB_INC . 'streams.php'); 
    80         include_once(BB_PATH . BB_INC . 'gettext.php'); 
    81 } 
    8278if ( !( defined('DB_NAME') || defined('WP_BB') && WP_BB ) ) {  // Don't include these when WP is running. 
     79        if ( defined('BB_LANG') && '' != BB_LANG ) { 
     80                include_once(BB_PATH . BB_INC . 'streams.php'); 
     81                include_once(BB_PATH . BB_INC . 'gettext.php'); 
     82        } 
    8383        require( BB_PATH . BB_INC . 'kses.php'); 
    8484        require( BB_PATH . BB_INC . 'l10n.php');