Skip to:
Content

BuddyPress.org

Changeset 3503


Ignore:
Timestamp:
12/02/2010 05:08:38 PM (14 years ago)
Author:
djpaul
Message:

Correct links and site title when BP-Default is used on hosted sites in a multisite configuration. Fixes #1972, #2061, #2653.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/feeds/bp-activity-favorites-feed.php

    r3300 r3503  
    1919
    2020<channel>
    21     <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Favorite Activity', 'buddypress' ) ?></title>
     21    <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Favorite Activity', 'buddypress' ) ?></title>
    2222    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2323    <link><?php echo site_url( BP_ACTIVITY_SLUG . '/#my-favorites/' ) ?></link>
  • trunk/bp-activity/feeds/bp-activity-friends-feed.php

    r2600 r3503  
    1919
    2020<channel>
    21     <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
     21    <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
    2222    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2323    <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' ?></link>
  • trunk/bp-activity/feeds/bp-activity-group-feed.php

    r2600 r3503  
    1919
    2020<channel>
    21     <title><?php echo bp_site_name() ?> | <?php echo $bp->groups->current_group->name ?> | <?php _e( 'Group Activity', 'buddypress' ) ?></title>
     21    <title><?php bp_site_name() ?> | <?php echo $bp->groups->current_group->name ?> | <?php _e( 'Group Activity', 'buddypress' ) ?></title>
    2222    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2323    <link><?php echo bp_get_group_permalink( $bp->groups->current_group ) . $bp->activity->slug . '/feed' ?></link>
  • trunk/bp-activity/feeds/bp-activity-mentions-feed.php

    r2600 r3503  
    1919
    2020<channel>
    21     <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Mentions', 'buddypress' ) ?></title>
     21    <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Mentions', 'buddypress' ) ?></title>
    2222    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2323    <link><?php echo site_url( BP_ACTIVITY_SLUG . '/#mentions/' ) ?></link>
  • trunk/bp-activity/feeds/bp-activity-mygroups-feed.php

    r2600 r3503  
    1919
    2020<channel>
    21     <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'My Groups - Public Activity', 'buddypress' ) ?></title>
     21    <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'My Groups - Public Activity', 'buddypress' ) ?></title>
    2222    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2323    <link><?php echo site_url( BP_ACTIVITY_SLUG . '/#my-groups/' ) ?></link>
  • trunk/bp-activity/feeds/bp-activity-personal-feed.php

    r2600 r3503  
    1919
    2020<channel>
    21     <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Activity', 'buddypress' ) ?></title>
     21    <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Activity', 'buddypress' ) ?></title>
    2222    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2323    <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/feed' ?></link>
  • trunk/bp-activity/feeds/bp-activity-sitewide-feed.php

    r2600 r3503  
    2020
    2121<channel>
    22     <title><?php echo bp_site_name() ?> | <?php _e( 'Site Wide Activity', 'buddypress' ) ?></title>
     22    <title><?php bp_site_name() ?> | <?php _e( 'Site Wide Activity', 'buddypress' ) ?></title>
    2323    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2424    <link><?php echo site_url() . '/' . $bp->activity->slug . '/feed' ?></link>
  • trunk/bp-core/bp-core-templatetags.php

    r3488 r3503  
    744744
    745745function bp_site_name() {
    746     echo apply_filters( 'bp_site_name', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
     746    echo apply_filters( 'bp_site_name', get_bloginfo( 'name', 'display' ) );
    747747}
    748748
     
    931931    }
    932932
    933     if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
    934         $blog_title = get_blog_option( $current_blog->blog_id, 'blogname' );
    935     } else {
    936         $blog_title = get_blog_option( BP_ROOT_BLOG, 'blogname' );
    937     }
    938 
    939     return apply_filters( 'bp_page_title', $blog_title . ' &#124; ' . esc_attr( $title ), esc_attr( $title ) );
     933    return apply_filters( 'bp_page_title', esc_attr( get_bloginfo( 'name', 'display' ) . ' &#124; ' . $title ), esc_attr( $title ) );
    940934}
    941935
  • trunk/bp-themes/bp-default/footer.php

    r3459 r3503  
    88
    99            <div id="site-generator" role="contentinfo">
    10                 <p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), get_bloginfo( 'name' ) ); ?></p>
     10                <p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), get_bloginfo( 'name', 'display' ) ); ?></p>
    1111            </div>
    1212
  • trunk/bp-themes/bp-default/header.php

    r3460 r3503  
    3939        <div id="header">
    4040
    41             <h1 id="logo" role="banner"><a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
     41            <h1 id="logo" role="banner"><a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
    4242
    4343            <div id="navigation" role="navigation">
Note: See TracChangeset for help on using the changeset viewer.