Changeset 1174 for trunk/bb-settings.php

Timestamp:

03/02/2008 06:34:21 AM (18 years ago)

Author:

sambauers

Message:

Make Bozo and Akismet plugins. Add bb-plugins directory. Let's see how it feels for a day or two then keep or dump.

File:

• trunk/bb-settings.php (modified) (4 diffs)

trunk/bb-settings.php

@@ -133 +133 @@
 require( BBPATH . BBINC . 'deprecated.php');
 
-if ( defined('BB_DISABLE_BOZO_CHECKS') && !BB_DISABLE_BOZO_CHECKS )
-    require( BBPATH . BBINC . 'bozo.php');
-
 require( BBPATH . BBINC . 'default-filters.php');
 require( BBPATH . BBINC . 'script-loader.php');
@@ -146 +143 @@
     $bbdb->show_errors();
 }
-
-if ( bb_get_option( 'akismet_key' ) )
-    require( BBPATH . BBINC . 'akismet.php');
 
 $_GET    = bb_global_sanitize($_GET   );
@@ -188 +182 @@
 if ( !defined('BBPLUGINURL') )
     define('BBPLUGINURL', $bb->uri . 'my-plugins/');
+if ( !defined('BBDEFAULTPLUGINDIR') )
+    define('BBDEFAULTPLUGINDIR', BBPATH . 'bb-plugins/');
+if ( !defined('BBDEFAULTPLUGINURL') )
+    define('BBDEFAULTPLUGINURL', $bb->uri . 'bb-plugins/');
 if ( !defined('BBTHEMEDIR') )
     define('BBTHEMEDIR', BBPATH . 'my-templates/');
@@ -377 +375 @@
 
 // Load Plugins
-if ( function_exists( 'glob' ) && is_callable( 'glob' ) && $_plugins_glob = glob(BBPLUGINDIR . '_*.php') )
+
+// Underscore plugins
+if ( function_exists( 'glob' ) && is_callable( 'glob' ) ) {
+    // First BBDEFAULTPLUGINDIR
+    $_plugins_glob = glob(BBDEFAULTPLUGINDIR . '_*.php');
     foreach ( $_plugins_glob as $_plugin )
         require($_plugin);
-unset($_plugins_glob, $_plugin);
+    unset($_plugins_glob, $_plugin);
+    
+    // Second BBPLUGINDIR, with no name clash testing
+    $_plugins_glob = glob(BBPLUGINDIR . '_*.php');
+    foreach ( $_plugins_glob as $_plugin )
+        require($_plugin);
+    unset($_plugins_glob, $_plugin);
+}
 do_action( 'bb_underscore_plugins_loaded' );
 
+// Plugins in BBPLUGINDIR take precedence over BBDEFAULTPLUGINDIR when names collide
 if ( $plugins = bb_get_option( 'active_plugins' ) )
     foreach ( (array) $plugins as $plugin )
-        if ( file_exists(BBPLUGINDIR . $plugin) )
+        if ( file_exists(BBPLUGINDIR . $plugin) ) {
             require( BBPLUGINDIR . $plugin );
+        } elseif ( file_exists(BBDEFAULTPLUGINDIR . $plugin) ) {
+            require( BBDEFAULTPLUGINDIR . $plugin );
+        }
 do_action( 'bb_plugins_loaded' );
 unset($plugins, $plugin);