<!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" />
<title>[BuddyPress][3595] trunk: Tidies up default theme's header.php -- removes duplicated generator line and the hardcoded activity feed links and attaches them to wp_head.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3595</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-28 14:25:51 +0000 (Tue, 28 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tidies up default theme's header.php -- removes duplicated generator line and the hardcoded activity feed links and attaches them to wp_head.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.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="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3594 => 3595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php        2010-12-28 13:51:02 UTC (rev 3594)
+++ trunk/bp-activity/bp-activity-templatetags.php        2010-12-28 14:25:51 UTC (rev 3595)
</span><span class="lines">@@ -1138,4 +1138,46 @@
</span><span class="cx">                 return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+/**
+ * Template tag so we can hook activity feed to &lt;head&gt;
+ *
+ * @see bp_dtheme_setup()
+ * @since 1.3
+ */
+function bp_dtheme_sitewide_feed() {
+?&gt;
+                &lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo( 'name' ) ?&gt; | &lt;?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?&gt;&quot; href=&quot;&lt;?php bp_sitewide_activity_feed_link() ?&gt;&quot; /&gt;
+&lt;?php
+}
+add_action( 'wp_head', 'bp_dtheme_sitewide_feed', 8 );
+
+/**
+ * Template tag so we can hook member activity feed to &lt;head&gt;
+ *
+ * @see bp_dtheme_setup()
+ * @since 1.3
+ */
+function bp_dtheme_member_feed() {
+        if ( !bp_is_member() )
+                return;
+?&gt;
+                &lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo( 'name' ) ?&gt; | &lt;?php bp_displayed_user_fullname() ?&gt; | &lt;?php _e( 'Activity RSS Feed', 'buddypress' ) ?&gt;&quot; href=&quot;&lt;?php bp_member_activity_feed_link() ?&gt;&quot; /&gt;
+&lt;?php
+}
+add_action( 'wp_head', 'bp_dtheme_member_feed', 8 );
+
+/**
+ * Template tag so we can hook group activity feed to &lt;head&gt;
+ *
+ * @see bp_dtheme_setup()
+ * @since 1.3
+ */
+function bp_dtheme_group_feed() {
+        if ( !bp_is_active( 'groups' ) || !bp_is_group() )
+                return;
+?&gt;
+                &lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo( 'name' ) ?&gt; | &lt;?php bp_current_group_name() ?&gt; | &lt;?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?&gt;&quot; href=&quot;&lt;?php bp_group_activity_feed_link() ?&gt;&quot; /&gt;
+&lt;?php
+}
+add_action( 'wp_head', 'bp_dtheme_group_feed', 8 );
</ins><span class="cx"> ?&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (3594 => 3595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php        2010-12-28 13:51:02 UTC (rev 3594)
+++ trunk/bp-themes/bp-default/header.php        2010-12-28 14:25:51 UTC (rev 3595)
</span><span class="lines">@@ -1,35 +1,13 @@
</span><span class="cx"> &lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php language_attributes(); ?&gt;&gt;
</span><del>-
</del><span class="cx">         &lt;head profile=&quot;http://gmpg.org/xfn/11&quot;&gt;
</span><del>-
-                &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php bloginfo('charset'); ?&gt;&quot; /&gt;
-
</del><ins>+                &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo( 'html_type' ); ?&gt;; charset=&lt;?php bloginfo( 'charset' ) ?&gt;&quot; /&gt;
</ins><span class="cx">                 &lt;title&gt;&lt;?php bp_page_title() ?&gt;&lt;/title&gt;
</span><ins>+                &lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo( 'stylesheet_url' ) ?&gt;&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
+                &lt;link rel=&quot;pingback&quot; href=&quot;&lt;?php bloginfo( 'pingback_url' ) ?&gt;&quot; /&gt;
</ins><span class="cx"> 
</span><del>-                &lt;?php do_action( 'bp_head' ) ?&gt;
-
-                &lt;meta name=&quot;generator&quot; content=&quot;WordPress &lt;?php bloginfo('version'); ?&gt;&quot; /&gt; &lt;!-- leave this for stats --&gt;
-
-                &lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php bloginfo('stylesheet_url'); ?&gt;&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
-
-                &lt;?php if ( function_exists( 'bp_sitewide_activity_feed_link' ) ) : ?&gt;
-                        &lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo('name'); ?&gt; | &lt;?php _e('Site Wide Activity RSS Feed', 'buddypress' ) ?&gt;&quot; href=&quot;&lt;?php bp_sitewide_activity_feed_link() ?&gt;&quot; /&gt;
-                &lt;?php endif; ?&gt;
-
-                &lt;?php if ( function_exists( 'bp_member_activity_feed_link' ) &amp;&amp; bp_is_member() ) : ?&gt;
-                        &lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo('name'); ?&gt; | &lt;?php bp_displayed_user_fullname() ?&gt; | &lt;?php _e( 'Activity RSS Feed', 'buddypress' ) ?&gt;&quot; href=&quot;&lt;?php bp_member_activity_feed_link() ?&gt;&quot; /&gt;
-                &lt;?php endif; ?&gt;
-
-                &lt;?php if ( function_exists( 'bp_group_activity_feed_link' ) &amp;&amp; bp_is_group() ) : ?&gt;
-                        &lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;&lt;?php bloginfo('name'); ?&gt; | &lt;?php bp_current_group_name() ?&gt; | &lt;?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?&gt;&quot; href=&quot;&lt;?php bp_group_activity_feed_link() ?&gt;&quot; /&gt;
-                &lt;?php endif; ?&gt;
-
-                &lt;link rel=&quot;pingback&quot; href=&quot;&lt;?php bloginfo('pingback_url'); ?&gt;&quot; /&gt;
-
</del><span class="cx">                 &lt;?php wp_head(); ?&gt;
</span><del>-
</del><span class="cx">         &lt;/head&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;body &lt;?php body_class() ?&gt; id=&quot;bp-default&quot;&gt;
</span><span class="lines">@@ -37,7 +15,6 @@
</span><span class="cx">                 &lt;?php do_action( 'bp_before_header' ) ?&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;div id=&quot;header&quot;&gt;
</span><del>-
</del><span class="cx">                         &lt;h1 id=&quot;logo&quot; role=&quot;banner&quot;&gt;&lt;a href=&quot;&lt;?php echo home_url() ?&gt;&quot; title=&quot;&lt;?php _e( 'Home', 'buddypress' ) ?&gt;&quot;&gt;&lt;?php bp_site_name() ?&gt;&lt;/a&gt;&lt;/h1&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;div id=&quot;navigation&quot; role=&quot;navigation&quot;&gt;
</span><span class="lines">@@ -48,7 +25,6 @@
</span><span class="cx">                                 &lt;div class=&quot;padder&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php if ( bp_search_form_enabled() ) : ?&gt;
</span><del>-
</del><span class="cx">                                         &lt;form action=&quot;&lt;?php echo bp_search_form_action() ?&gt;&quot; method=&quot;post&quot; id=&quot;search-form&quot;&gt;
</span><span class="cx">                                                 &lt;input type=&quot;text&quot; id=&quot;search-terms&quot; name=&quot;search-terms&quot; value=&quot;&quot; /&gt;
</span><span class="cx">                                                 &lt;?php echo bp_search_form_type_select() ?&gt;
</span><span class="lines">@@ -56,7 +32,6 @@
</span><span class="cx">                                                 &lt;input type=&quot;submit&quot; name=&quot;search-submit&quot; id=&quot;search-submit&quot; value=&quot;&lt;?php _e( 'Search', 'buddypress' ) ?&gt;&quot; /&gt;
</span><span class="cx">                                                 &lt;?php wp_nonce_field( 'bp_search_form' ) ?&gt;
</span><span class="cx">                                         &lt;/form&gt;&lt;!-- #search-form --&gt;
</span><del>-
</del><span class="cx">                                 &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php do_action( 'bp_search_login_bar' ) ?&gt;
</span></span></pre>
</div>
</div>

</body>
</html>