Changeset 4181

Timestamp:

09/03/2012 09:01:51 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Introduce bbp_register subaction:

• Switch bbp_init priority to init 0.
• Hook bbp_register to bbp_init, prority 0.
• Hook _register_ actions onto bbp_register.
• Registers post types, taxonomies, post statuses, shortcodes, and topic views early, so they are available ahead of 'init' action.
• Fixes plugin dependency issue with bbPress objects not being registered when they are needed.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-actions.php (modified) (2 diffs)
• bbp-core-dependency.php (modified) (11 diffs)

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

@@ -42 +42 @@
  */
 add_action( 'plugins_loaded',         'bbp_loaded',                 10 );
-add_action( 'init',                   'bbp_init',                   10 );
+add_action( 'init',                   'bbp_init',                   0  ); // Early for bbp_register
+add_action( 'parse_query',            'bbp_parse_query',            2  ); // Early for overrides
 add_action( 'widgets_init',           'bbp_widgets_init',           10 );
-add_action( 'parse_query',            'bbp_parse_query',            2  ); // Early for overrides
 add_action( 'generate_rewrite_rules', 'bbp_generate_rewrite_rules', 10 );
 add_action( 'wp_enqueue_scripts',     'bbp_enqueue_scripts',        10 );
@@ -77 +77 @@
  * Attach various initialization actions to the init action.
  * The load order helps to execute code at the correct time.
- *                                                    v---Load order
- */
-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 );
+ *                                              v---Load order
+ */
+add_action( 'bbp_init', 'bbp_register',         0   );
+add_action( 'bbp_init', 'bbp_add_rewrite_tags', 20  );
+add_action( 'bbp_init', 'bbp_ready',            999 );
+
+/**
+ * bbp_register - Attached to 'init' above on 0 priority
+ *
+ * Attach various initialization actions early to the init action.
+ * The load order helps to execute code at the correct time.
+ *                                                         v---Load order
+ */
+add_action( 'bbp_register', 'bbp_register_post_types',     2  );
+add_action( 'bbp_register', 'bbp_register_post_statuses',  4  );
+add_action( 'bbp_register', 'bbp_register_taxonomies',     6  );
+add_action( 'bbp_register', 'bbp_register_views',          8  );
+add_action( 'bbp_register', 'bbp_register_shortcodes',     10 );
 
 // Autoembeds

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

@@ -104 +104 @@
 
 /**
+ * Register any objects before anything is initialized
+ *
+ * @since bbPress (r4180)
+ * @uses do_action() Calls 'bbp_register'
+ */
+function bbp_register() {
+    do_action( 'bbp_register' );
+}
+
+/**
  * Initialize any code after everything has been loaded
  *
@@ -110 +120 @@
  */
 function bbp_init() {
-    do_action ( 'bbp_init' );
+    do_action( 'bbp_init' );
 }
 
@@ -120 +130 @@
  */
 function bbp_widgets_init() {
-    do_action ( 'bbp_widgets_init' );
+    do_action( 'bbp_widgets_init' );
 }
 
@@ -130 +140 @@
  */
 function bbp_setup_current_user() {
-    do_action ( 'bbp_setup_current_user' );
+    do_action( 'bbp_setup_current_user' );
 }
 
@@ -162 +172 @@
  */
 function bbp_register_post_types() {
-    do_action ( 'bbp_register_post_types' );
+    do_action( 'bbp_register_post_types' );
 }
 
@@ -172 +182 @@
  */
 function bbp_register_post_statuses() {
-    do_action ( 'bbp_register_post_statuses' );
+    do_action( 'bbp_register_post_statuses' );
 }
 
@@ -182 +192 @@
  */
 function bbp_register_taxonomies() {
-    do_action ( 'bbp_register_taxonomies' );
+    do_action( 'bbp_register_taxonomies' );
 }
 
@@ -192 +202 @@
  */
 function bbp_register_views() {
-    do_action ( 'bbp_register_views' );
+    do_action( 'bbp_register_views' );
 }
 
@@ -202 +212 @@
  */
 function bbp_enqueue_scripts() {
-    do_action ( 'bbp_enqueue_scripts' );
+    do_action( 'bbp_enqueue_scripts' );
 }
 
@@ -212 +222 @@
  */
 function bbp_add_rewrite_tags() {
-    do_action ( 'bbp_add_rewrite_tags' );
+    do_action( 'bbp_add_rewrite_tags' );
 }
 
@@ -222 +232 @@
  */
 function bbp_login_form_login() {
-    do_action ( 'bbp_login_form_login' );
+    do_action( 'bbp_login_form_login' );
 }