Changeset 5847 for trunk/bp-core/bp-core-hooks.php

Timestamp:

02/27/2012 03:23:41 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Clean up bp-core-hooks.php

File:

• trunk/bp-core/bp-core-hooks.php (modified) (4 diffs)

trunk/bp-core/bp-core-hooks.php

@@ -37 +37 @@
 add_action( 'init',                    'bp_init',                   10    );
 add_action( 'wp',                      'bp_ready',                  10    );
+add_action( 'wp_head',                 'bp_head',                   10    );
+add_action( 'wp_footer',               'bp_footer',                 10    );
 add_action( 'setup_theme',             'bp_setup_theme',            10    );
 add_action( 'after_theme_setup',       'bp_after_theme_setup',      10    );
@@ -46 +48 @@
 add_filter( 'map_meta_cap',            'bp_map_meta_caps',          10, 4 );
 
-// Piggy back WordPress theme actions
-add_action( 'wp_head',   'bp_head',   10 );
-add_action( 'wp_footer', 'bp_footer', 10 );
-
-//add_action( 'generate_rewrite_rules', 'bp_generate_rewrite_rules', 10 );
-
 /**
  * bp_loaded - Attached to 'plugins_loaded' above
@@ -90 +86 @@
 add_action( 'bp_template_redirect', 'bp_screens', 4 );
 
+// Load the admin
+if ( is_admin() ) {
+    add_action( 'bp_loaded', 'bp_admin' );
+}
+
 /**
  * Plugin Dependency
@@ -199 +200 @@
 }
 
-
-/** Admin *********************************************************************/
-
-if ( is_admin() ) {
-
-    /** Actions ***************************************************************/
-
-    add_action( 'bp_loaded',         'bp_admin'                   );
-    //add_action( 'bp_admin_init',     'bp_admin_settings_help'     );
-    //add_action( 'admin_menu',        'bp_admin_separator'         );
-    //add_action( 'custom_menu_order', 'bp_admin_custom_menu_order' );
-    //add_action( 'menu_order',        'bp_admin_menu_order'        );
-
-    /**
-     * Run the updater late on 'bp_admin_init' to ensure that all alterations
-     * to the permalink structure have taken place. This fixes the issue of
-     * permalinks not being flushed properly when a BuddyPress update occurs.
-     */
-    //add_action( 'bp_admin_init',    'bp_setup_updater', 999 );
-
-    /** Filters ***************************************************************/
-}
-
 /** Theme *********************************************************************/