| @@ -48,20 +48,18 @@ | ||
| 48 | 48 | add_action( 'menu_order', 'bbp_admin_menu_order' ); |
| 49 | 49 | add_filter( 'custom_menu_order', 'bbp_admin_custom_menu_order' ); |
| 50 | 50 | |
| 51 | 51 | // Hook on to admin_init |
| 52 | -add_action( 'bbp_admin_init', 'bbp_setup_updater', 999 ); | |
| 53 | 52 | add_action( 'bbp_admin_init', 'bbp_register_importers' ); |
| 54 | 53 | add_action( 'bbp_admin_init', 'bbp_register_admin_styles' ); |
| 55 | 54 | add_action( 'bbp_admin_init', 'bbp_register_admin_scripts' ); |
| 56 | 55 | add_action( 'bbp_admin_init', 'bbp_register_admin_settings' ); |
| 57 | 56 | |
| 58 | -// Hook on to current_screen (only in Site admin, not Network or User) | |
| 59 | -if ( is_blog_admin() ) { | |
| 60 | - add_action( 'bbp_current_screen', 'bbp_admin_forums' ); | |
| 61 | - add_action( 'bbp_current_screen', 'bbp_admin_topics' ); | |
| 62 | - add_action( 'bbp_current_screen', 'bbp_admin_replies' ); | |
| 63 | -} | |
| 57 | +// Hook on to current_screen | |
| 58 | +add_action( 'bbp_current_screen', 'bbp_admin_forums' ); | |
| 59 | +add_action( 'bbp_current_screen', 'bbp_admin_topics' ); | |
| 60 | +add_action( 'bbp_current_screen', 'bbp_admin_replies' ); | |
| 61 | +add_action( 'bbp_current_screen', 'bbp_setup_updater', 999 ); | |
| 64 | 62 | |
| 65 | 63 | // Initialize the admin area |
| 66 | 64 | add_action( 'bbp_init', 'bbp_setup_admin' ); |
| 67 | 65 | |
| @@ -119,10 +117,10 @@ | ||
| 119 | 117 | |
| 120 | 118 | /** |
| 121 | 119 | * Setup bbPress admin |
| 122 | 120 | * |
| 123 | - * @since 2.0.0 bbPress (r1000) | |
| 124 | - * @since 2.6.0 bbPress (r6598) Moved to actions.php | |
| 121 | + * @since 2.0.0 bbPress (r2515) | |
| 122 | + * @since 2.6.0 bbPress (r6601) Moved to actions.php | |
| 125 | 123 | */ |
| 126 | 124 | function bbp_admin() { |
| 127 | 125 | return bbp_setup_admin(); |
| 128 | 126 | } |
| @@ -130,9 +128,9 @@ | ||
| 130 | 128 | /** |
| 131 | 129 | * When a new site is created in a multisite installation, run the activation |
| 132 | 130 | * routine on that site |
| 133 | 131 | * |
| 134 | - * @since 2.0.0 bbPress (r3283) | |
| 132 | + * @since 2.0.0 bbPress (r3284) | |
| 135 | 133 | * |
| 136 | 134 | * @param int $blog_id |
| 137 | 135 | * @param int $user_id |
| 138 | 136 | * @param string $domain |
| @@ -214,9 +212,9 @@ | ||
| 214 | 212 | |
| 215 | 213 | /** |
| 216 | 214 | * Filter sample permalinks so that certain languages display properly. |
| 217 | 215 | * |
| 218 | - * @since 2.0.0 bbPress (r3336) | |
| 216 | + * @since 2.0.0 bbPress (r3337) | |
| 219 | 217 | * |
| 220 | 218 | * @param string $post_link Custom post type permalink |
| 221 | 219 | * @param object $_post Post data object |
| 222 | 220 | * @param bool $leavename Optional, defaults to false. Whether to keep post name or page name. |
| @@ -266,9 +264,9 @@ | ||
| 266 | 264 | |
| 267 | 265 | /** |
| 268 | 266 | * Piggy back admin_notices action |
| 269 | 267 | * |
| 270 | - * @since 2.1.0 bbPress (r3766) | |
| 268 | + * @since 2.0.0 bbPress (r2615) | |
| 271 | 269 | */ |
| 272 | 270 | function bbp_admin_notices() { |
| 273 | 271 | do_action( 'bbp_admin_notices' ); |
| 274 | 272 | } |
| @@ -284,9 +282,9 @@ | ||
| 284 | 282 | |
| 285 | 283 | /** |
| 286 | 284 | * Dedicated action to register admin styles |
| 287 | 285 | * |
| 288 | - * @since 2.6.0 bbPress (r6912) | |
| 286 | + * @since 2.6.0 bbPress (r6913) | |
| 289 | 287 | */ |
| 290 | 288 | function bbp_register_admin_styles() { |
| 291 | 289 | |
| 292 | 290 | /** |
| @@ -291,9 +289,9 @@ | ||
| 291 | 289 | |
| 292 | 290 | /** |
| 293 | 291 | * Action used to register the admin styling |
| 294 | 292 | * |
| 295 | - * @since 2.1.0 | |
| 293 | + * @since 2.1.0 bbPress (r3766) | |
| 296 | 294 | * @deprecated 2.6.0 |
| 297 | 295 | */ |
| 298 | 296 | do_action( 'bbp_register_admin_style' ); |
| 299 | 297 | |
| @@ -299,9 +297,9 @@ | ||
| 299 | 297 | |
| 300 | 298 | /** |
| 301 | 299 | * Action used to register all admin styling |
| 302 | 300 | * |
| 303 | - * @since 2.6.0 | |
| 301 | + * @since 2.6.0 bbPress (r6913) | |
| 304 | 302 | */ |
| 305 | 303 | do_action( 'bbp_register_admin_styles' ); |
| 306 | 304 | } |
| 307 | 305 | |
| @@ -307,9 +305,9 @@ | ||
| 307 | 305 | |
| 308 | 306 | /** |
| 309 | 307 | * Dedicated action to register admin scripts |
| 310 | 308 | * |
| 311 | - * @since 2.6.0 bbPress (r6912) | |
| 309 | + * @since 2.6.0 bbPress (r6913) | |
| 312 | 310 | */ |
| 313 | 311 | function bbp_register_admin_scripts() { |
| 314 | 312 | do_action( 'bbp_register_admin_scripts' ); |
| 315 | 313 | } |
| @@ -325,9 +323,9 @@ | ||
| 325 | 323 | |
| 326 | 324 | /** |
| 327 | 325 | * Dedicated action to output admin tools.php sections |
| 328 | 326 | * |
| 329 | - * @since 2.6.0 bbPress (r6273) | |
| 327 | + * @since 2.6.0 bbPress (r6274) | |
| 330 | 328 | */ |
| 331 | 329 | function bbp_admin_tool_box() { |
| 332 | 330 | do_action( 'bbp_admin_tool_box' ); |
| 333 | 331 | } |
| @@ -334,9 +332,9 @@ | ||
| 334 | 332 | |
| 335 | 333 | /** |
| 336 | 334 | * Dedicated action to hook into the current screen |
| 337 | 335 | * |
| 338 | - * @since 2.6.0 bbPress (r6185) | |
| 336 | + * @since 2.6.0 bbPress (r6186) | |
| 339 | 337 | * |
| 340 | 338 | * @param WP_Screen $current_screen |
| 341 | 339 | */ |
| 342 | 340 | function bbp_current_screen( $current_screen = '' ) { |
