<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3503] trunk:
Correct links and site title when BP-Default is used on hosted sites in a multisite configuration
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3503</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-02 17:08:38 +0000 (Thu, 02 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct links and site title when BP-Default is used on hosted sites in a multisite configuration. Fixes #1972, #2061, #2653.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityfeedsbpactivityfavoritesfeedphp">trunk/bp-activity/feeds/bp-activity-favorites-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivityfriendsfeedphp">trunk/bp-activity/feeds/bp-activity-friends-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitygroupfeedphp">trunk/bp-activity/feeds/bp-activity-group-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitymentionsfeedphp">trunk/bp-activity/feeds/bp-activity-mentions-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitymygroupsfeedphp">trunk/bp-activity/feeds/bp-activity-mygroups-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitypersonalfeedphp">trunk/bp-activity/feeds/bp-activity-personal-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitysitewidefeedphp">trunk/bp-activity/feeds/bp-activity-sitewide-feed.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfooterphp">trunk/bp-themes/bp-default/footer.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityfeedsbpactivityfavoritesfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-favorites-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-favorites-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-favorites-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Favorite Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Favorite Activity', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo site_url( BP_ACTIVITY_SLUG . '/#my-favorites/' ) ?></link>
</span><span class="cx"> <description><?php echo $bp->displayed_user->fullname; ?> - <?php _e( 'Favorite Activity', 'buddypress' ) ?></description>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivityfriendsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-friends-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-friends-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-friends-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' ?></link>
</span><span class="cx"> <description><?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), $bp->displayed_user->fullname ) ?></description>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitygroupfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-group-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-group-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-group-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php echo $bp->groups->current_group->name ?> | <?php _e( 'Group Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php echo $bp->groups->current_group->name ?> | <?php _e( 'Group Activity', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo bp_get_group_permalink( $bp->groups->current_group ) . $bp->activity->slug . '/feed' ?></link>
</span><span class="cx"> <description><?php printf( __( '%s - Group Activity Feed', 'buddypress' ), $bp->groups->current_group->name ) ?></description>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitymentionsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-mentions-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-mentions-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-mentions-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Mentions', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Mentions', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo site_url( BP_ACTIVITY_SLUG . '/#mentions/' ) ?></link>
</span><span class="cx"> <description><?php echo $bp->displayed_user->fullname; ?> - <?php _e( 'Mentions', 'buddypress' ) ?></description>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitymygroupsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-mygroups-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-mygroups-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-mygroups-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'My Groups - Public Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'My Groups - Public Activity', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo site_url( BP_ACTIVITY_SLUG . '/#my-groups/' ) ?></link>
</span><span class="cx"> <description><?php echo $bp->displayed_user->fullname; ?> - <?php _e( 'My Groups - Public Activity', 'buddypress' ) ?></description>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitypersonalfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-personal-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-personal-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-personal-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Activity', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/feed' ?></link>
</span><span class="cx"> <description><?php printf( __( '%s - Activity Feed', 'buddypress' ), $bp->displayed_user->fullname ) ?></description>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitysitewidefeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-sitewide-feed.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-sitewide-feed.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-activity/feeds/bp-activity-sitewide-feed.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php echo bp_site_name() ?> | <?php _e( 'Site Wide Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php _e( 'Site Wide Activity', 'buddypress' ) ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><span class="cx"> <link><?php echo site_url() . '/' . $bp->activity->slug . '/feed' ?></link>
</span><span class="cx"> <description><?php _e( 'Site Wide Activity Feed', 'buddypress' ) ?></description>
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-core/bp-core-templatetags.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_site_name() {
</span><del>- echo apply_filters( 'bp_site_name', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
</del><ins>+ echo apply_filters( 'bp_site_name', get_bloginfo( 'name', 'display' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_core_get_wp_profile() {
</span><span class="lines">@@ -930,13 +930,7 @@
</span><span class="cx"> $title = __( 'Create a Blog', 'buddypress' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
- $blog_title = get_blog_option( $current_blog->blog_id, 'blogname' );
- } else {
- $blog_title = get_blog_option( BP_ROOT_BLOG, 'blogname' );
- }
-
- return apply_filters( 'bp_page_title', $blog_title . ' &#124; ' . esc_attr( $title ), esc_attr( $title ) );
</del><ins>+ return apply_filters( 'bp_page_title', esc_attr( get_bloginfo( 'name', 'display' ) . ' &#124; ' . $title ), esc_attr( $title ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_styles() {
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/footer.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/footer.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-themes/bp-default/footer.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> <?php get_sidebar( 'footer' ) ?>
</span><span class="cx">
</span><span class="cx"> <div id="site-generator" role="contentinfo">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_footer' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (3502 => 3503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2010-12-02 15:07:44 UTC (rev 3502)
+++ trunk/bp-themes/bp-default/header.php 2010-12-02 17:08:38 UTC (rev 3503)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="header">
</span><span class="cx">
</span><del>- <h1 id="logo" role="banner"><a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</del><ins>+ <h1 id="logo" role="banner"><a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</ins><span class="cx">
</span><span class="cx"> <div id="navigation" role="navigation">
</span><span class="cx"> <?php wp_nav_menu( array( 'container' => false, 'menu_id' => 'nav', 'theme_location' => 'primary', 'fallback_cb' => 'bp_dtheme_main_nav' ) ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>