Changeset 3641

Timestamp:

01/01/2011 08:13:49 PM (15 years ago)

Author:

boonebgorges

Message:

Fetches the bp_pages names and slugs from the root blog table when viewing a secondary blog. Fixes #2989

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -985 +985 @@
     $content = preg_replace('/<img[^>]*>/Ui', '', $content );
 
-    if ( !empty( $matches ) ) {
+    if ( !empty( $matches ) && !empty( $matches[0] ) ) {
         /* Get the SRC value */
         preg_match( '/<img.*?(src\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $src );

trunk/bp-core.php

@@ -252 +252 @@
     if ( empty( $page_ids ) )
         return false;
+        
+    $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'posts' : $wpdb->posts;
 
     $page_ids_sql = implode( ',', (array)$page_ids );
-    $page_names = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM {$wpdb->posts} WHERE ID IN ({$page_ids_sql}) " ) );
+
+    $page_names = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) " ) );
     $pages = new stdClass;
 
@@ -267 +270 @@
                 /* Get the slug */
                 while ( $page_name->post_parent != 0 ) {
-                    $parent = $wpdb->get_results( $wpdb->prepare( "SELECT post_name, post_parent FROM {$wpdb->posts} WHERE ID = %d", $page_name->post_parent ) );
+                    $parent = $wpdb->get_results( $wpdb->prepare( "SELECT post_name, post_parent FROM {$posts_table_name} WHERE ID = %d", $page_name->post_parent ) );
                     $slug[] = $parent[0]->post_name;
                     $page_name->post_parent = $parent[0]->post_parent;