Changeset 4070 for branches/plugin/bbp-admin/bbp-topics.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-topics.php (modified) (20 diffs)

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

@@ -39 +39 @@
      * @uses BBP_Topics_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
@@ -93 +93 @@
 
     /**
+     * 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
      *
@@ -98 +111 @@
      * @access private
      */
-    function setup_globals() {
-
-        // Setup the post type for this admin component
+    private function setup_globals() {
         $this->post_type = bbp_get_topic_post_type();
     }
@@ -113 +124 @@
      */
     public function edit_help() {
+
+        if ( $this->bail() ) return;
 
         // Overview
@@ -176 +189 @@
     public function new_help() {
 
+        if ( $this->bail() ) return;
+
         $customize_display = '<p>' . __( 'The title field and the big topic 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>';
 
@@ -243 +258 @@
      * @uses do_action() Calls 'bbp_topic_attributes_metabox'
      */
-    function attributes_metabox() {
+    public function attributes_metabox() {
+
+        if ( $this->bail() ) return;
+
         add_meta_box (
             'bbp_topic_attributes',
@@ -268 +286 @@
      * @return int Parent id
      */
-    function attributes_metabox_save( $topic_id ) {
+    public function attributes_metabox_save( $topic_id ) {
         
+        if ( $this->bail() ) return $topic_id;
+
         // Bail if doing an autosave
         if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
@@ -335 +355 @@
      *                    id
      */
-    function author_metabox() {
+    public function author_metabox() {
+
+        if ( $this->bail() ) return;
 
         // Bail if post_type is not a topic
@@ -370 +392 @@
      * @return int Topic or reply id
      */
-    function author_metabox_save( $post_id ) {
+    public function author_metabox_save( $post_id ) {
+
+        if ( $this->bail() ) return $post_id;
 
         // Bail if no post_id
@@ -410 +434 @@
      * @uses do_action() Calls 'bbp_admin_head'
      */
-    function admin_head() {
+    public function admin_head() {
+
+        if ( $this->bail() ) return;
+
         ?>
 
@@ -489 +516 @@
      * @uses wp_safe_redirect() Redirect the page to custom url
      */
-    function toggle_topic() {
+    public function toggle_topic() {
+
+        if ( $this->bail() ) return;
 
         // Only proceed if GET is a topic toggle action
@@ -568 +597 @@
      *                        message, topic id, notice and is it a failure
      */
-    function toggle_topic_notice() {
+    public function toggle_topic_notice() {
+
+        if ( $this->bail() ) return;
 
         // Only proceed if GET is a topic toggle action
@@ -640 +671 @@
      * @return array $columns bbPress topic columns
      */
-    function topics_column_headers( $columns ) {
+    public function topics_column_headers( $columns ) {
+
+        if ( $this->bail() ) return $columns;
+
         $columns = array(
             'cb'                    => '<input type="checkbox" />',
@@ -682 +716 @@
     function topics_column_data( $column, $topic_id ) {
 
+        if ( $this->bail() ) return;
+
         // Get topic forum ID
         $forum_id = bbp_get_topic_forum_id( $topic_id );
@@ -778 +814 @@
      * @return array $actions Actions
      */
-    function topics_row_actions( $actions, $topic ) {
+    public function topics_row_actions( $actions, $topic ) {
+
+        if ( $this->bail() ) return $actions;
 
         unset( $actions['inline hide-if-no-js'] );
@@ -850 +888 @@
      * @return bool False. If post type is not topic or reply
      */
-    function filter_dropdown() {
+    public function filter_dropdown() {
+
+        if ( $this->bail() ) return;
 
         // Add Empty Spam button
@@ -882 +922 @@
     function filter_post_rows( $query_vars ) {
 
+        if ( $this->bail() ) return $query_vars;
+
         // Add post_parent query_var if one is present
         if ( !empty( $_GET['bbp_forum_id'] ) ) {
@@ -907 +949 @@
      * @return array
      */
-    function updated_messages( $messages ) {
+    public function updated_messages( $messages ) {
         global $post_ID;
+
+        if ( $this->bail() ) return $messages;
 
         // URL for the current topic
@@ -974 +1018 @@
  */
 function bbp_admin_topics() {
-    global $typenow;
-
-    if ( bbp_get_topic_post_type() != $typenow )
-        return;
-
     bbpress()->admin->topics = new BBP_Topics_Admin();
 }