Changeset 3278

Timestamp:

05/31/2011 12:40:22 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix issue causing admin post row nonce checks to fail due to incorrect load order. Add Akismet support to core, which will take advantage of the Akismet plugin for WordPress if it is activated. Props Nightgunner5 for original Aksimet concept.

Location:

branches/plugin

Files:

• bbp-includes/bbp-core-akismet.php (added)
• bbp-includes/bbp-core-hooks.php (modified) (2 diffs)
• bbpress.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-hooks.php

@@ -59 +59 @@
 add_action( 'bbp_init', 'bbp_setup_current_user',     4   );
 add_action( 'bbp_init', 'bbp_setup_theme_compat',     6   );
-add_action( 'bbp_init', 'bbp_register_post_types',    8   );
-add_action( 'bbp_init', 'bbp_register_post_statuses', 10  );
-add_action( 'bbp_init', 'bbp_register_taxonomies',    12  );
-add_action( 'bbp_init', 'bbp_register_views',         14  );
-add_action( 'bbp_init', 'bbp_register_shortcodes',    16  );
-add_action( 'bbp_init', 'bbp_add_rewrite_tags',       18  );
+add_action( 'bbp_init', 'bbp_setup_akismet',          8   );
+add_action( 'bbp_init', 'bbp_register_post_types',    10  );
+add_action( 'bbp_init', 'bbp_register_post_statuses', 12  );
+add_action( 'bbp_init', 'bbp_register_taxonomies',    14  );
+add_action( 'bbp_init', 'bbp_register_views',         16  );
+add_action( 'bbp_init', 'bbp_register_shortcodes',    18  );
+add_action( 'bbp_init', 'bbp_add_rewrite_tags',       20  );
 add_action( 'bbp_init', 'bbp_ready',                  999 );
 
@@ -73 +74 @@
 if ( is_admin() ) {
     add_action( 'bbp_init',          'bbp_admin'                   );
-    add_action( 'bbp_admin_init',    'bbp_forums_admin'            );
-    add_action( 'bbp_admin_init',    'bbp_topics_admin'            );
-    add_action( 'bbp_admin_init',    'bbp_replies_admin'           );
+    add_action( 'bbp_admin_init',    'bbp_forums_admin',         9 );
+    add_action( 'bbp_admin_init',    'bbp_topics_admin',         9 );
+    add_action( 'bbp_admin_init',    'bbp_replies_admin',        9 );
     add_action( 'bbp_admin_init',    'bbp_admin_settings_help'     );
     add_action( 'admin_menu',        'bbp_admin_separator'         );

branches/plugin/bbpress.php

@@ -379 +379 @@
         /** Individual files **************************************************/
 
-        $files = array( 'loader', 'options', 'caps', 'hooks', 'classes', 'widgets', 'shortcodes', 'compatibility' );
+        $core = array(
+            'loader',        // Loader Actions
+            'options',       // Configuration Options
+            'caps',          // Roles and capabilities
+            'hooks',         // All filters and actions
+            'classes',       // Common classes
+            'widgets',       // Sidebar widgets
+            'shortcodes',    // Shortcodes for use with pages and posts
+            'compatibility', // Theme compatibility for existing themes
+            'akismet'        // Spam prevention for topics and replies
+        );
 
         // Load the files
-        foreach ( $files as $file )
+        foreach ( $core as $file )
             require( $this->plugin_dir . '/bbp-includes/bbp-core-' . $file . '.php' );
 
         /** Components ********************************************************/
 
-        $components = array( 'general', 'forum', 'topic', 'reply', 'user' );
-
-        // Load the function and template files
-        foreach ( $components as $file ) {
-            require( $this->plugin_dir . '/bbp-includes/bbp-' . $file . '-functions.php' );
-            require( $this->plugin_dir . '/bbp-includes/bbp-' . $file . '-template.php'  );
-        }
+        $components = array(
+            'general',       // Common functions and template tags
+            'forum',         // Forums contain subforums, topics, and replies
+            'topic',         // Topics contain replies
+            'reply',         // Replies are individual responses to topics
+            'user'           // Individual user profile view/edit pages
+        );
+
+        $files = array(
+            'functions',     // Functions used to carry out specific tasks
+            'template'       // Functions intended for use in template files
+        );
+
+        // Load the files
+        foreach ( $components as $component )
+            foreach ( $files as $type )
+                require( $this->plugin_dir . '/bbp-includes/bbp-' . $component . '-' . $type . '.php' );
 
         /** Admin *************************************************************/