Skip to:
Content

BuddyPress.org

Ticket #3622: 3622.02.patch

File 3622.02.patch, 1.5 KB (added by boonebgorges, 10 years ago)
  • bp-activity/bp-activity-template.php

    diff --git bp-activity/bp-activity-template.php bp-activity/bp-activity-template.php
    index 0d871dc..9e8128c 100644
    function bp_sitewide_activity_feed_link() { 
    24392439         * @return string The sitewide activity feed link
    24402440         */
    24412441        function bp_get_sitewide_activity_feed_link() {
    2442                 return apply_filters( 'bp_get_sitewide_activity_feed_link', home_url( bp_get_activity_root_slug() . '/feed/' ) );
     2442                return apply_filters( 'bp_get_sitewide_activity_feed_link', bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/feed/' );
    24432443        }
    24442444
    24452445/**
  • bp-core/bp-core-functions.php

    diff --git bp-core/bp-core-functions.php bp-core/bp-core-functions.php
    index 6eb4923..8a06519 100644
    function bp_core_get_directory_pages() { 
    136136        // Get pages and IDs
    137137        if ( $page_ids = bp_core_get_directory_page_ids() ) {
    138138
    139                 $posts_table_name = bp_is_multiblog_mode() ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
     139                // Always get page data from the root blog, except on multiblog mode, when it comes
     140                // from the current blog
     141                $posts_table_name = bp_is_multiblog_mode() ? $wpdb->posts : $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts';
    140142                $page_ids_sql     = implode( ',', (array)$page_ids );
    141143                $page_names       = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
    142144