Changeset 1362

Timestamp:

03/20/2008 07:36:54 PM (18 years ago)

Author:

mdawaffe

Message:

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

File:

• branches/0.8/bb-settings.php (modified) (1 diff)

branches/0.8/bb-settings.php

@@ -76 +76 @@
 if ( !defined('BB_LANG') && defined('BBLANG') && '' != BBLANG ) // User has set old constant
     define('BB_LANG', BBLANG);
-if ( defined('BB_LANG') && '' != BB_LANG ) {
-    include_once(BB_PATH . BB_INC . 'streams.php');
-    include_once(BB_PATH . BB_INC . 'gettext.php');
-}
 if ( !( defined('DB_NAME') || defined('WP_BB') && WP_BB ) ) {  // Don't include these when WP is running.
+    if ( defined('BB_LANG') && '' != BB_LANG ) {
+        include_once(BB_PATH . BB_INC . 'streams.php');
+        include_once(BB_PATH . BB_INC . 'gettext.php');
+    }
     require( BB_PATH . BB_INC . 'kses.php');
     require( BB_PATH . BB_INC . 'l10n.php');