<!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] [2600] trunk/bp-activity/feeds:
  Fixing issues with single WP and feed titles.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2600</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-04 17:18:22 +0000 (Thu, 04 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixing issues with single WP and feed titles.</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>
</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 (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-favorites-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-favorites-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'Favorite Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'Favorite Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo site_url( BP_ACTIVITY_SLUG . '/#my-favorites/' ) ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'Favorite Activity', 'buddypress' ) ?&gt;&lt;/description&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivityfriendsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-friends-feed.php (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-friends-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-friends-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'Friends Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'Friends Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/my-friends/feed' ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), $bp-&gt;displayed_user-&gt;fullname ) ?&gt;&lt;/description&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitygroupfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-group-feed.php (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-group-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-group-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo $bp-&gt;groups-&gt;current_group-&gt;name ?&gt; - &lt;?php _e( 'Group Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;groups-&gt;current_group-&gt;name ?&gt; | &lt;?php _e( 'Group Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ) . $bp-&gt;activity-&gt;slug . '/feed' ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php printf( __( '%s - Group Activity Feed', 'buddypress' ), $bp-&gt;groups-&gt;current_group-&gt;name  ) ?&gt;&lt;/description&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitymentionsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-mentions-feed.php (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-mentions-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-mentions-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'Mentions', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'Mentions', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo site_url( BP_ACTIVITY_SLUG . '/#mentions/' ) ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'Mentions', 'buddypress' ) ?&gt;&lt;/description&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitymygroupsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-mygroups-feed.php (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-mygroups-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-mygroups-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'My Groups - Public Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'My Groups - Public Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo site_url( BP_ACTIVITY_SLUG . '/#my-groups/' ) ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'My Groups - Public Activity', 'buddypress' ) ?&gt;&lt;/description&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitypersonalfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-personal-feed.php (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-personal-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-personal-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; - &lt;?php _e( 'Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php echo $bp-&gt;displayed_user-&gt;fullname; ?&gt; | &lt;?php _e( 'Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo $bp-&gt;displayed_user-&gt;domain . $bp-&gt;activity-&gt;slug . '/feed' ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php printf( __( '%s - Activity Feed', 'buddypress' ), $bp-&gt;displayed_user-&gt;fullname ) ?&gt;&lt;/description&gt;
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitysitewidefeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-sitewide-feed.php (2599 => 2600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-sitewide-feed.php        2010-02-04 17:11:17 UTC (rev 2599)
+++ trunk/bp-activity/feeds/bp-activity-sitewide-feed.php        2010-02-04 17:18:22 UTC (rev 2600)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> &gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;channel&gt;
</span><del>-        &lt;title&gt;&lt;?php echo get_site_option( 'site_name' ); ?&gt; - &lt;?php _e( 'Site Wide Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</del><ins>+        &lt;title&gt;&lt;?php echo bp_site_name() ?&gt; | &lt;?php _e( 'Site Wide Activity', 'buddypress' ) ?&gt;&lt;/title&gt;
</ins><span class="cx">         &lt;atom:link href=&quot;&lt;?php self_link(); ?&gt;&quot; rel=&quot;self&quot; type=&quot;application/rss+xml&quot; /&gt;
</span><span class="cx">         &lt;link&gt;&lt;?php echo site_url() . '/' . $bp-&gt;activity-&gt;slug . '/feed' ?&gt;&lt;/link&gt;
</span><span class="cx">         &lt;description&gt;&lt;?php _e( 'Site Wide Activity Feed', 'buddypress' ) ?&gt;&lt;/description&gt;
</span></span></pre>
</div>
</div>

</body>
</html>