Changeset 1174 for trunk/bb-admin/plugins.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-admin/plugins.php (modified) (2 diffs)

trunk/bb-admin/plugins.php

@@ -4 +4 @@
 $plugins = bb_get_plugins();
 $_plugins = array();
-if ( function_exists( 'glob' ) && is_callable( 'glob' ) && $_plugins_glob = glob(BBPLUGINDIR . '_*.php') ) {
+if ( function_exists( 'glob' ) && is_callable( 'glob' ) ) {
+    $_plugins_glob = glob(BBDEFAULTPLUGINDIR . '_*.php');
     foreach ( $_plugins_glob as $_plugin ) {
         $_data = bb_get_plugin_data( $_plugin );
         $_plugins[$_plugin] = $_data ? $_data : true;
     }
+    unset($_plugins_glob, $_data, $_plugin);
+    
+    $_plugins_glob = glob(BBPLUGINDIR . '_*.php');
+    foreach ( $_plugins_glob as $_plugin ) {
+        $_data = bb_get_plugin_data( $_plugin );
+        $_plugins[$_plugin] = $_data ? $_data : true;
+    }
+    unset($_plugins_glob, $_data, $_plugin);
 }
-unset($_plugins_glob, $_plugin);
+
 
 $current = (array) bb_get_option( 'active_plugins' );
@@ -16 +25 @@
 $update = false;
 foreach ( $current as $c => $cur )
-    if ( !file_exists(BBPLUGINDIR . $cur) ) {
+    if ( !file_exists(BBPLUGINDIR . $cur) && !file_exists(BBDEFAULTPLUGINDIR . $cur) ) {
         $update = true;
         unset($current[$c]);