Changeset 5686 for trunk/bp-blogs/bp-blogs-actions.php

Timestamp:

02/09/2012 10:36:36 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Blogs component. See #3989.

File:

• trunk/bp-blogs/bp-blogs-actions.php (modified) (1 diff)

trunk/bp-blogs/bp-blogs-actions.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Blogs Actions
+ *
+ * @package BuddyPress
+ * @subpackage BlogsActions
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
+/**
+ * Redirect to a random blog in the multisite network
+ *
+ * @since BuddyPress (1.0)
+ * @package BuddyPress
+ * @subpackage BlogsActions
+ */
 function bp_blogs_redirect_to_random_blog() {
-    global $bp, $wpdb;
 
-    if ( bp_is_blogs_component() && isset( $_GET['random-blog'] ) ) {
+    // Bail if not looking for a random blog
+    if ( ! bp_is_blogs_component() || ! isset( $_GET['random-blog'] ) )
+        return;
+
+    // Multisite is active so find a random blog
+    if ( is_multisite() ) {
         $blog = bp_blogs_get_random_blogs( 1, 1 );
+        bp_core_redirect( get_site_url( $blog['blogs'][0]->blog_id ) );
 
-        bp_core_redirect( get_site_url( $blog['blogs'][0]->blog_id ) );
+    // No multisite and still called, always redirect to root
+    } else {
+        bp_core_redirect( bp_core_get_root_domain() );
     }
 }