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

Timestamp:

09/10/2011 10:27:19 PM (13 years ago)

Author:

johnjamesjacoby

Message:

API adjustments:

• Refactor _status_ vars into callable functions.
• Audit usage of $bbp global.
• Perform get_class() checks on extensions to avoid errors if global $bbp is overloaded.
• Bump DB version to 175.

File:

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

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

@@ -242 +242 @@
         // Category?
         if ( !empty( $_POST['bbp_forum_type'] ) && in_array( $_POST['bbp_forum_type'], array( 'forum', 'category' ) ) ) {
-            if ( 'category' == $_POST['bbp_forum_type'] && !bbp_is_forum_category( $forum_id ) )
+            if ( 'category' == $_POST['bbp_forum_type'] && !bbp_is_forum_category( $forum_id ) ) {
                 bbp_categorize_forum( $forum_id );
-            elseif ( 'forum' == $_POST['bbp_forum_type'] && bbp_is_forum_category( $forum_id ) )
+            } elseif ( 'forum' == $_POST['bbp_forum_type'] && bbp_is_forum_category( $forum_id ) ) {
                 bbp_normalize_forum( $forum_id );
+            }
         }
 
         // Visibility
-        if ( !empty( $_POST['bbp_forum_visibility'] ) && in_array( $_POST['bbp_forum_visibility'], array( 'publish', 'private', 'hidden' ) ) ) {
+        if ( !empty( $_POST['bbp_forum_visibility'] ) && in_array( $_POST['bbp_forum_visibility'], array( bbp_get_public_status_id(), bbp_get_private_status_id(), bbp_get_hidden_status_id() ) ) ) {
 
             // Get forums current visibility
@@ -261 +262 @@
 
                     // Hidden
-                    case 'hidden'  :
+                    case bbp_get_hidden_status_id()  :
                         bbp_hide_forum( $forum_id, $visibility );
                         break;
 
                     // Private
-                    case 'private' :
+                    case bbp_get_private_status_id() :
                         bbp_privatize_forum( $forum_id, $visibility );
                         break;
 
                     // Publish (default)
-                    case 'publish'  :
+                    case bbp_get_public_status_id()  :
                     default        :
                         bbp_publicize_forum( $forum_id, $visibility );
@@ -553 +554 @@
     global $bbp;
 
+    // Bail if bbPress is not loaded
+    if ( 'bbPress' !== get_class( $bbp ) ) return;
+
     $bbp->admin->forums = new BBP_Forums_Admin();
 }