Changeset 6779 for trunk/bp-forums/bp-forums-functions.php

Timestamp:

02/08/2013 06:36:14 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Variable cleanup to bp-forums-functions.php.

File:

• trunk/bp-forums/bp-forums-functions.php (modified) (20 diffs)

trunk/bp-forums/bp-forums-functions.php

@@ -35 +35 @@
  */
 function bp_forums_is_installed_correctly() {
-        global $bp;
+        $bp = buddypress();
 
         if ( isset( $bp->forums->bbconfig ) && is_file( $bp->forums->bbconfig ) )
@@ -52 +52 @@
  */
 function bp_forums_has_directory() {
-        global $bp;
-
-        return (bool) !empty( $bp->pages->forums->id );
+        return (bool) !empty( buddypress()->pages->forums->id );
 }
 
@@ -67 +65 @@
         do_action( 'bbpress_init' );
 
-        $defaults = array(
+        $r = wp_parse_args( $args, array(
                 'forum_name'        => '',
                 'forum_desc'        => '',
@@ -73 +71 @@
                 'forum_order'       => false,
                 'forum_is_category' => 0
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -84 +80 @@
         do_action( 'bbpress_init' );
 
-        $defaults = array(
+        $r = wp_parse_args( $args, array(
                 'forum_id'          => '',
                 'forum_name'        => '',
@@ -92 +88 @@
                 'forum_order'       => false,
                 'forum_is_category' => 0
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -113 +107 @@
 
 function bp_forums_get_forum_topics( $args = '' ) {
-        global $bp;
-
-        do_action( 'bbpress_init' );
-
-        $defaults = array(
+        do_action( 'bbpress_init' );
+
+        $r = wp_parse_args( $args, array(
                 'type'          => 'newest',
                 'forum_id'      => false,
@@ -128 +120 @@
                 'show_stickies' => 'all',
                 'filter'        => false // if $type = tag then filter is the tag name, otherwise it's terms to search on.
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -184 +174 @@
         do_action( 'bbpress_init' );
 
-        $defaults = array(
+        $r = wp_parse_args( $args, array(
                 'topic_title'            => '',
                 'topic_slug'             => '',
@@ -197 +187 @@
                 'topic_tags'             => false, // accepts array or comma delim
                 'forum_id'               => 0      // accepts ids or slugs
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -229 +217 @@
 
 function bp_forums_update_topic( $args = '' ) {
-        global $bp;
-
-        do_action( 'bbpress_init' );
-
-        $defaults = array(
+        do_action( 'bbpress_init' );
+
+        $r = wp_parse_args( $args, array(
                 'topic_id'    => false,
                 'topic_title' => '',
                 'topic_text'  => '',
                 'topic_tags'  => false
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -264 +248 @@
 
 function bp_forums_sticky_topic( $args = '' ) {
-        global $bp;
-
-        do_action( 'bbpress_init' );
-
-        $defaults = array(
+        do_action( 'bbpress_init' );
+
+        $r = wp_parse_args( $args, array(
                 'topic_id' => false,
                 'mode'     => 'stick' // stick/unstick
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -285 +265 @@
 
 function bp_forums_openclose_topic( $args = '' ) {
-        global $bp;
-
-        do_action( 'bbpress_init' );
-
-        $defaults = array(
+        do_action( 'bbpress_init' );
+
+        $r = wp_parse_args( $args, array(
                 'topic_id' => false,
                 'mode'     => 'close' // stick/unstick
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -306 +282 @@
 
 function bp_forums_delete_topic( $args = '' ) {
-        global $bp;
-
-        do_action( 'bbpress_init' );
-
-        $defaults = array(
+        do_action( 'bbpress_init' );
+
+        $r = wp_parse_args( $args, array(
                 'topic_id' => false
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
         extract( $r, EXTR_SKIP );
 
@@ -403 +375 @@
  */
 function bp_forums_total_topic_count_for_user( $user_id = 0, $type = 'active' ) {
-        global $bp;
-
         do_action( 'bbpress_init' );
 
@@ -443 +413 @@
  */
 function bp_forums_total_replied_count_for_user( $user_id = 0, $type = 'active' ) {
-        global $bp;
-
         do_action( 'bbpress_init' );
 
@@ -480 +448 @@
 
 function bp_forums_get_topic_extras( $topics ) {
-        global $bp, $wpdb, $bbdb;
+        global $wpdb, $bbdb;
 
         if ( empty( $topics ) )
                 return $topics;
+
+        $bp = buddypress();
 
         // Get the topic ids
@@ -556 +526 @@
 
 function bp_forums_delete_post( $args = '' ) {
-        global $bp;
-
-        do_action( 'bbpress_init' );
-
-        $defaults = array(
+        do_action( 'bbpress_init' );
+
+        $r = wp_parse_args( $args, array(
                 'post_id' => false
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ) );
+
         extract( $r, EXTR_SKIP );
 
@@ -571 +538 @@
 
 function bp_forums_insert_post( $args = '' ) {
-        global $bp;
-
         do_action( 'bbpress_init' );
 
@@ -666 +631 @@
 
 function bp_forums_filter_caps( $allcaps ) {
-        global $bp, $wp_roles, $bb_table_prefix;
+        global $wp_roles, $bb_table_prefix;
 
         if ( !bp_loggedin_user_id() )