Changeset 5356

Timestamp:

11/24/2011 03:09:00 AM (13 years ago)

Author:

boonebgorges

Message:

Ensures that Sitewide Tags blog posts do not go to the activity stream (unless explicitly told to do so by filtering 'bp_blogs_block_sitewide_tags_activity'). Fixes #3742.

Location:

branches/1.5

Files:

• bp-blogs/bp-blogs-functions.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)

branches/1.5/bp-blogs/bp-blogs-functions.php

@@ -161 +161 @@
         $user_id = (int)$post->post_author;
 
-    // This is to stop infinite loops with Donncha's sitewide tags plugin
-    if ( !empty( $bp->site_options['tags_blog_id'] ) && (int)$blog_id == (int)$bp->site_options['tags_blog_id'] )
+    // Stop infinite loops with WordPress MU Sitewide Tags.
+    // That plugin changed the way its settings were stored at some point. Thus the dual check.
+    if ( !empty( $bp->site_options['sitewide_tags_blog'] ) ) {
+        $st_options = maybe_unserialize( $bp->site_options['sitewide_tags_blog'] );
+        $tags_blog_id = isset( $st_options['tags_blog_id'] ) ? $st_options['tags_blog_id'] : 0;
+    } else {
+        $tags_blog_id = isset( $bp->site_options['tags_blog_id'] ) ? $bp->site_options['tags_blog_id'] : 0;
+    }
+
+    if ( (int)$blog_id == $tags_blog_id && apply_filters( 'bp_blogs_block_sitewide_tags_activity', true ) )
         return false;
 
@@ -314 +322 @@
             return false;
     }
-    
-    
 
     if ( $role != 'subscriber' )

branches/1.5/bp-core/bp-core-functions.php

@@ -1009 +1009 @@
     if ( is_multisite() ) {
         $network_options = apply_filters( 'bp_core_network_options', array(
-            'tags_blog_id'    => '0',
-            'registration'    => '0',
-            'fileupload_maxk' => '1500'
+            'tags_blog_id'       => '0',
+            'sitewide_tags_blog' => '',
+            'registration'       => '0',
+            'fileupload_maxk'    => '1500'
         ) );