Changeset 4070 for branches/plugin/bbp-admin/bbp-forums.php

Timestamp:

07/08/2012 08:55:34 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Admin:

• Introduce bail() method to forum/topic/reply components.
• Bail out of other methods if post_type doesn't match.
• Fixes issue where meta-box and styling were not always available on all appropriate screens.
• Also reverts some perfomance improvements implimented in r4053.

File:

• branches/plugin/bbp-admin/bbp-forums.php (modified) (14 diffs)

branches/plugin/bbp-admin/bbp-forums.php

@@ -39 +39 @@
      * @uses BBP_Forums_Admin::setup_help() Setup the help text
      */
-    function __construct() {
+    public function __construct() {
         $this->setup_globals();
         $this->setup_actions();
@@ -56 +56 @@
      * @uses bbp_get_reply_post_type() To get the reply post type
      */
-    function setup_actions() {
+    private function setup_actions() {
 
         // Add some general styling to the admin area
@@ -81 +81 @@
 
     /**
+     * Should we bail out of this method?
+     *
+     * @since bbPress (r4067)
+     * @return boolean
+     */
+    private function bail() {
+        if ( $this->post_type != get_current_screen()->post_type )
+            return true;
+
+        return false;
+    }
+        
+    /**
      * Admin globals
      *
@@ -86 +99 @@
      * @access private
      */
-    function setup_globals() {
-
-        // Setup the post type for this admin component
+    private function setup_globals() {
         $this->post_type = bbp_get_forum_post_type();
     }
@@ -101 +112 @@
      */
     public function edit_help() {
+
+        if ( $this->bail() ) return;
 
         // Overview
@@ -164 +177 @@
     public function new_help() {
 
+        if ( $this->bail() ) return;
+
         $customize_display = '<p>' . __( 'The title field and the big forum editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.', 'bbpress' ) . '</p>';
 
@@ -234 +249 @@
      * @uses do_action() Calls 'bbp_forum_attributes_metabox'
      */
-    function attributes_metabox() {
+    public function attributes_metabox() {
+        
+        if ( $this->bail() ) return;
+
         add_meta_box (
             'bbp_forum_attributes',
@@ -269 +287 @@
      * @return int Forum id
      */
-    function attributes_metabox_save( $forum_id ) {
+    public function attributes_metabox_save( $forum_id ) {
+
+        if ( $this->bail() ) return $forum_id;
 
         // Bail if doing an autosave
@@ -312 +332 @@
      * @uses do_action() Calls 'bbp_admin_head'
      */
-    function admin_head() {
+    public function admin_head() {
+        
+        if ( $this->bail() ) return;
+
         ?>
 
@@ -388 +411 @@
      * @return array $columns bbPress forum columns
      */
-    function column_headers( $columns ) {
+    public function column_headers( $columns ) {
+        
+        if ( $this->bail() ) return $columns;
+
         $columns = array (
             'cb'                    => '<input type="checkbox" />',
@@ -419 +445 @@
      *                    column and forum id
      */
-    function column_data( $column, $forum_id ) {
+    public function column_data( $column, $forum_id ) {
+        
+        if ( $this->bail() ) return;
+
         switch ( $column ) {
             case 'bbp_forum_topic_count' :
@@ -465 +494 @@
      * @return array $actions Actions
      */
-    function row_actions( $actions, $forum ) {
+    public function row_actions( $actions, $forum ) {
+        
+        if ( $this->bail() ) return $actions;
+
         unset( $actions['inline hide-if-no-js'] );
 
@@ -489 +521 @@
      * @return array
      */
-    function updated_messages( $messages ) {
+    public function updated_messages( $messages ) {
         global $post_ID;
+
+        if ( $this->bail() ) return $messages;
 
         // URL for the current forum
@@ -556 +590 @@
  */
 function bbp_admin_forums() {
-    global $typenow;
-
-    if ( bbp_get_forum_post_type() != $typenow )
-        return;
-
     bbpress()->admin->forums = new BBP_Forums_Admin();
 }