Changeset 6186 for trunk/src/includes/admin/actions.php

Timestamp:

12/27/2016 10:45:16 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Admin: Implement new loading sequence for major admin components.

• Introduce new bbp_current_screen sub-action
• Hook forums/topics/replies into bbp_current_screen
• Remove various bail() methods, which were fragile and terrible anyways
• Revert r6178, thanks to order-of-operation issues with get_current_screen()
• Remove Comments & Discussion metaboxes if comments is not explicitly supported

See #2959.

File:

• trunk/src/includes/admin/actions.php (modified) (3 diffs)

trunk/src/includes/admin/actions.php

@@ -43 +43 @@
 add_action( 'admin_head',              'bbp_admin_head'                    );
 add_action( 'admin_notices',           'bbp_admin_notices'                 );
+add_action( 'menu_order',              'bbp_admin_menu_order'              );
 add_action( 'custom_menu_order',       'bbp_admin_custom_menu_order'       );
-add_action( 'menu_order',              'bbp_admin_menu_order'              );
+add_action( 'current_screen',          'bbp_current_screen'                );
 add_action( 'wpmu_new_blog',           'bbp_new_site',               10, 6 );
 
 // Hook on to admin_init
-add_action( 'bbp_admin_init', 'bbp_admin_forums'                );
-add_action( 'bbp_admin_init', 'bbp_admin_topics'                );
-add_action( 'bbp_admin_init', 'bbp_admin_replies'               );
 add_action( 'bbp_admin_init', 'bbp_setup_updater',          999 );
 add_action( 'bbp_admin_init', 'bbp_register_importers'          );
@@ -56 +54 @@
 add_action( 'bbp_admin_init', 'bbp_register_admin_settings'     );
 add_action( 'bbp_admin_init', 'bbp_do_activation_redirect', 1   );
+
+// Hook on to current_screen
+add_action( 'bbp_current_screen', 'bbp_admin_forums'  );
+add_action( 'bbp_current_screen', 'bbp_admin_topics'  );
+add_action( 'bbp_current_screen', 'bbp_admin_replies' );
 
 // Initialize the admin area
@@ -261 +264 @@
     do_action( 'bbp_register_admin_settings' );
 }
+
+/**
+ * Dedicated action to hook into the current screen
+ *
+ * @since 2.6.0 bbPress (r6185)
+ *
+ * @param WP_Screen $current_screen
+ * @uses do_action() Calls 'bbp_current_screen'
+ */
+function bbp_current_screen( $current_screen = '' ) {
+    do_action( 'bbp_current_screen', $current_screen );
+}