<!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][6827] trunk: Enables theme compat for legacy bbPress 1.x forum content</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><a href="http://buddypress.trac.wordpress.org/changeset/6827">6827</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-03-01 21:34:55 +0000 (Fri, 01 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Enables theme compat for legacy bbPress 1.x forum content

- Don't exclude top-level forum directory page from wp_nav_menu() as long
  as forums are correctly installed
- Introduces BP_Forums_Legacy_Theme_Compat
- Tweaks forum directory table styling

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4854">#4854</a>

Props imath</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunkbpforumsbpforumsscreensphp">trunk/bp-forums/bp-forums-screens.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressforumsindexphp">trunk/bp-templates/bp-legacy/buddypress/forums/index.php</a></li>
<li><a href="#trunkbptemplatesbplegacycssbuddypresscss">trunk/bp-templates/bp-legacy/css/buddypress.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (6826 => 6827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php        2013-03-01 20:57:30 UTC (rev 6826)
+++ trunk/bp-core/bp-core-filters.php        2013-03-01 21:34:55 UTC (rev 6827)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">         if ( !empty( $bp-&gt;pages-&gt;register ) )
</span><span class="cx">                 $pages[] = $bp-&gt;pages-&gt;register-&gt;id;
</span><span class="cx"> 
</span><del>-        if ( !empty( $bp-&gt;pages-&gt;forums ) )
</del><ins>+        if ( !empty( $bp-&gt;pages-&gt;forums ) &amp;&amp; ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) &amp;&amp; bp_forums_has_directory() &amp;&amp; !bp_forums_is_installed_correctly() ) ) )
</ins><span class="cx">                 $pages[] = $bp-&gt;pages-&gt;forums-&gt;id;
</span><span class="cx"> 
</span><span class="cx">         return apply_filters( 'bp_core_exclude_pages', $pages );
</span></span></pre></div>
<a id="trunkbpforumsbpforumsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-screens.php (6826 => 6827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-screens.php        2013-03-01 20:57:30 UTC (rev 6826)
+++ trunk/bp-forums/bp-forums-screens.php        2013-03-01 21:34:55 UTC (rev 6827)
</span><span class="lines">@@ -118,3 +118,98 @@
</span><span class="cx">         bp_core_load_template( apply_filters( 'bp_forums_screen_single_topic', 'forums/single/topic' ) );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_screens', 'bp_forums_screen_single_topic' );
</span><ins>+
+
+/** Theme Compatability *******************************************************/
+
+/**
+ * The main theme compat class for legacy BuddyPress forums, as powered by bbPress 1.x
+ *
+ * This class sets up the necessary theme compatability actions to safely output
+ * old forum template parts to the_title and the_content areas of a theme.
+ *
+ * @since BuddyPress (1.7)
+ */
+class BP_Forum_Legacy_Theme_Compat {
+
+        /**
+         * Setup the old forums component theme compatibility
+         *
+         * @since BuddyPress (1.7)
+         */
+        public function __construct() {
+                add_action( 'bp_setup_theme_compat', array( $this, 'is_legacy_forum' ) );
+        }
+
+        /**
+         * Are we looking at something that needs old forum theme compatability?
+         *
+         * @since BuddyPress (1.7)
+         */
+        public function is_legacy_forum() {
+
+                // Bail if not looking at a group
+                if ( ! bp_is_forums_component() )
+                        return;
+
+                // forum Directory
+                if ( ( ! bp_current_action() || ( 'tag' == bp_current_action() &amp;&amp; bp_action_variables() ) ) &amp;&amp; ! bp_current_item() ) {
+
+                        if ( ! bp_forums_has_directory() )
+                                return false;
+
+                        if ( ! bp_forums_is_installed_correctly() ) {
+                                bp_core_add_message( __( 'The forums component has not been set up yet.', 'buddypress' ), 'error' );
+                                bp_core_redirect( bp_get_root_domain() );
+                        }
+
+                        bp_update_is_directory( true, 'forums' );
+
+                        do_action( 'bp_forums_directory_forums_setup' );
+
+                        add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'directory_dummy_post' ) );
+                        add_filter( 'bp_replace_the_content',                    array( $this, 'directory_content'    ) );
+
+                }
+
+        }
+
+        /** Directory *************************************************************/
+
+        /**
+         * Update the global $post with directory data
+         *
+         * @since BuddyPress (1.7)
+         */
+        public function directory_dummy_post() {
+
+                // Title based on ability to create groups
+                if ( is_user_logged_in() ) {
+                        $title = __( 'Forums', 'buddypress' ) . '&amp;nbsp;&lt;a class=&quot;button show-hide-new bp-title-button&quot; href=&quot;#new-topic&quot; id=&quot;new-topic-button&quot;&gt;' . __( 'New Topic', 'buddypress' ) . '&lt;/a&gt;';
+                } else {
+                        $title = __( 'Forums', 'buddypress' );
+                }
+
+                bp_theme_compat_reset_post( array(
+                        'ID'             =&gt; 0,
+                        'post_title'     =&gt; $title,
+                        'post_author'    =&gt; 0,
+                        'post_date'      =&gt; 0,
+                        'post_content'   =&gt; '',
+                        'post_type'      =&gt; 'bp_forum',
+                        'post_status'    =&gt; 'publish',
+                        'is_archive'     =&gt; true,
+                        'comment_status' =&gt; 'closed'
+                ) );
+        }
+
+        /**
+         * Filter the_content with the old forum index template part
+         *
+         * @since BuddyPress (1.7)
+         */
+        public function directory_content() {
+                bp_buffer_template_part( 'forums/index' );
+        }
+}
+new BP_Forum_Legacy_Theme_Compat();
</ins></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/forums/index.php (6826 => 6827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/forums/index.php        2013-03-01 20:57:30 UTC (rev 6826)
+++ trunk/bp-templates/bp-legacy/buddypress/forums/index.php        2013-03-01 21:34:55 UTC (rev 6827)
</span><span class="lines">@@ -1,136 +1,140 @@
</span><del>-&lt;?php do_action( 'bp_before_directory_forums' ); ?&gt;
</del><ins>+&lt;div id=&quot;buddypress&quot;&gt;
+        
+        &lt;?php do_action( 'bp_before_directory_forums' ); ?&gt;
</ins><span class="cx"> 
</span><del>-&lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forums-search-form&quot; class=&quot;dir-form&quot;&gt;
</del><ins>+        &lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forums-search-form&quot; class=&quot;dir-form&quot;&gt;
</ins><span class="cx"> 
</span><del>-        &lt;?php do_action( 'bp_before_directory_forums_content' ); ?&gt;
</del><ins>+                &lt;?php do_action( 'bp_before_directory_forums_content' ); ?&gt;
</ins><span class="cx"> 
</span><del>-        &lt;div id=&quot;forums-dir-search&quot; class=&quot;dir-search&quot; role=&quot;search&quot;&gt;
</del><ins>+                &lt;div id=&quot;forums-dir-search&quot; class=&quot;dir-search&quot; role=&quot;search&quot;&gt;
</ins><span class="cx"> 
</span><del>-                &lt;?php bp_directory_forums_search_form(); ?&gt;
</del><ins>+                        &lt;?php bp_directory_forums_search_form(); ?&gt;
</ins><span class="cx"> 
</span><del>-        &lt;/div&gt;
-&lt;/form&gt;
</del><ins>+                &lt;/div&gt;
+        &lt;/form&gt;
</ins><span class="cx"> 
</span><del>-&lt;?php do_action( 'bp_before_topics' ); ?&gt;
</del><ins>+        &lt;?php do_action( 'bp_before_topics' ); ?&gt;
</ins><span class="cx"> 
</span><del>-&lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forums-directory-form&quot; class=&quot;dir-form&quot;&gt;
</del><ins>+        &lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forums-directory-form&quot; class=&quot;dir-form&quot;&gt;
</ins><span class="cx"> 
</span><del>-        &lt;div class=&quot;item-list-tabs&quot; role=&quot;navigation&quot;&gt;
-                &lt;ul&gt;
-                        &lt;li class=&quot;selected&quot; id=&quot;forums-all&quot;&gt;&lt;a href=&quot;&lt;?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?&gt;&quot;&gt;&lt;?php printf( __( 'All Topics &lt;span&gt;%s&lt;/span&gt;', 'buddypress' ), bp_get_forum_topic_count() ); ?&gt;&lt;/a&gt;&lt;/li&gt;
</del><ins>+                &lt;div class=&quot;item-list-tabs&quot; role=&quot;navigation&quot;&gt;
+                        &lt;ul&gt;
+                                &lt;li class=&quot;selected&quot; id=&quot;forums-all&quot;&gt;&lt;a href=&quot;&lt;?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?&gt;&quot;&gt;&lt;?php printf( __( 'All Topics &lt;span&gt;%s&lt;/span&gt;', 'buddypress' ), bp_get_forum_topic_count() ); ?&gt;&lt;/a&gt;&lt;/li&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;?php if ( is_user_logged_in() &amp;&amp; bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?&gt;
</del><ins>+                                &lt;?php if ( is_user_logged_in() &amp;&amp; bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;li id=&quot;forums-personal&quot;&gt;&lt;a href=&quot;&lt;?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?&gt;&quot;&gt;&lt;?php printf( __( 'My Topics &lt;span&gt;%s&lt;/span&gt;', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?&gt;&lt;/a&gt;&lt;/li&gt;
</del><ins>+                                        &lt;li id=&quot;forums-personal&quot;&gt;&lt;a href=&quot;&lt;?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?&gt;&quot;&gt;&lt;?php printf( __( 'My Topics &lt;span&gt;%s&lt;/span&gt;', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?&gt;&lt;/a&gt;&lt;/li&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;?php endif; ?&gt;
</del><ins>+                                &lt;?php endif; ?&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;?php do_action( 'bp_forums_directory_group_types' ); ?&gt;
</del><ins>+                                &lt;?php do_action( 'bp_forums_directory_group_types' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                &lt;/ul&gt;
-        &lt;/div&gt;
</del><ins>+                        &lt;/ul&gt;
+                &lt;/div&gt;
</ins><span class="cx"> 
</span><del>-        &lt;div class=&quot;item-list-tabs&quot; id=&quot;subnav&quot; role=&quot;navigation&quot;&gt;
-                &lt;ul&gt;
</del><ins>+                &lt;div class=&quot;item-list-tabs&quot; id=&quot;subnav&quot; role=&quot;navigation&quot;&gt;
+                        &lt;ul&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;?php do_action( 'bp_forums_directory_group_sub_types' ); ?&gt;
</del><ins>+                                &lt;?php do_action( 'bp_forums_directory_group_sub_types' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;li id=&quot;forums-order-select&quot; class=&quot;last filter&quot;&gt;
</del><ins>+                                &lt;li id=&quot;forums-order-select&quot; class=&quot;last filter&quot;&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;label for=&quot;forums-order-by&quot;&gt;&lt;?php _e( 'Order By:', 'buddypress' ); ?&gt;&lt;/label&gt;
-                                &lt;select id=&quot;forums-order-by&quot;&gt;
-                                        &lt;option value=&quot;active&quot;&gt;&lt;?php _e( 'Last Active', 'buddypress' ); ?&gt;&lt;/option&gt;
-                                        &lt;option value=&quot;popular&quot;&gt;&lt;?php _e( 'Most Posts', 'buddypress' ); ?&gt;&lt;/option&gt;
-                                        &lt;option value=&quot;unreplied&quot;&gt;&lt;?php _e( 'Unreplied', 'buddypress' ); ?&gt;&lt;/option&gt;
</del><ins>+                                        &lt;label for=&quot;forums-order-by&quot;&gt;&lt;?php _e( 'Order By:', 'buddypress' ); ?&gt;&lt;/label&gt;
+                                        &lt;select id=&quot;forums-order-by&quot;&gt;
+                                                &lt;option value=&quot;active&quot;&gt;&lt;?php _e( 'Last Active', 'buddypress' ); ?&gt;&lt;/option&gt;
+                                                &lt;option value=&quot;popular&quot;&gt;&lt;?php _e( 'Most Posts', 'buddypress' ); ?&gt;&lt;/option&gt;
+                                                &lt;option value=&quot;unreplied&quot;&gt;&lt;?php _e( 'Unreplied', 'buddypress' ); ?&gt;&lt;/option&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;?php do_action( 'bp_forums_directory_order_options' ); ?&gt;
</del><ins>+                                                &lt;?php do_action( 'bp_forums_directory_order_options' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;/select&gt;
-                        &lt;/li&gt;
-                &lt;/ul&gt;
-        &lt;/div&gt;
</del><ins>+                                        &lt;/select&gt;
+                                &lt;/li&gt;
+                        &lt;/ul&gt;
+                &lt;/div&gt;
</ins><span class="cx"> 
</span><del>-        &lt;div id=&quot;forums-dir-list&quot; class=&quot;forums dir-list&quot; role=&quot;main&quot;&gt;
</del><ins>+                &lt;div id=&quot;forums-dir-list&quot; class=&quot;forums dir-list&quot; role=&quot;main&quot;&gt;
</ins><span class="cx"> 
</span><del>-                &lt;?php bp_get_template_part( 'forums/forums-loop' ); ?&gt;
</del><ins>+                        &lt;?php bp_get_template_part( 'forums/forums-loop' ); ?&gt;
</ins><span class="cx"> 
</span><del>-        &lt;/div&gt;
</del><ins>+                &lt;/div&gt;
</ins><span class="cx"> 
</span><del>-        &lt;?php do_action( 'bp_directory_forums_content' ); ?&gt;
</del><ins>+                &lt;?php do_action( 'bp_directory_forums_content' ); ?&gt;
</ins><span class="cx"> 
</span><del>-        &lt;?php wp_nonce_field( 'directory_forums', '_wpnonce-forums-filter' ); ?&gt;
</del><ins>+                &lt;?php wp_nonce_field( 'directory_forums', '_wpnonce-forums-filter' ); ?&gt;
</ins><span class="cx"> 
</span><del>-&lt;/form&gt;
</del><ins>+        &lt;/form&gt;
</ins><span class="cx"> 
</span><del>-&lt;?php do_action( 'bp_after_directory_forums' ); ?&gt;
</del><ins>+        &lt;?php do_action( 'bp_after_directory_forums' ); ?&gt;
</ins><span class="cx"> 
</span><del>-&lt;?php do_action( 'bp_before_new_topic_form' ); ?&gt;
</del><ins>+        &lt;?php do_action( 'bp_before_new_topic_form' ); ?&gt;
</ins><span class="cx"> 
</span><del>-&lt;div id=&quot;new-topic-post&quot;&gt;
</del><ins>+        &lt;div id=&quot;new-topic-post&quot;&gt;
</ins><span class="cx"> 
</span><del>-        &lt;?php if ( is_user_logged_in() ) : ?&gt;
</del><ins>+                &lt;?php if ( is_user_logged_in() ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                &lt;?php if ( bp_is_active( 'groups' ) &amp;&amp; bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&amp;type=alphabetical&amp;max=100&amp;per_page=100' ) ) : ?&gt;
</del><ins>+                        &lt;?php if ( bp_is_active( 'groups' ) &amp;&amp; bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&amp;type=alphabetical&amp;max=100&amp;per_page=100' ) ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forum-topic-form&quot; class=&quot;standard-form&quot;&gt;
</del><ins>+                                &lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forum-topic-form&quot; class=&quot;standard-form&quot;&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;?php do_action( 'groups_forum_new_topic_before' ); ?&gt;
</del><ins>+                                        &lt;?php do_action( 'groups_forum_new_topic_before' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;a name=&quot;post-new&quot;&gt;&lt;/a&gt;
-                                &lt;h5&gt;&lt;?php _e( 'Create New Topic:', 'buddypress' ); ?&gt;&lt;/h5&gt;
</del><ins>+                                        &lt;a name=&quot;post-new&quot;&gt;&lt;/a&gt;
+                                        &lt;h5&gt;&lt;?php _e( 'Create New Topic:', 'buddypress' ); ?&gt;&lt;/h5&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;?php do_action( 'template_notices' ); ?&gt;
</del><ins>+                                        &lt;?php do_action( 'template_notices' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;label&gt;&lt;?php _e( 'Title:', 'buddypress' ); ?&gt;&lt;/label&gt;
-                                &lt;input type=&quot;text&quot; name=&quot;topic_title&quot; id=&quot;topic_title&quot; value=&quot;&quot; maxlength=&quot;100&quot; /&gt;
</del><ins>+                                        &lt;label&gt;&lt;?php _e( 'Title:', 'buddypress' ); ?&gt;&lt;/label&gt;
+                                        &lt;input type=&quot;text&quot; name=&quot;topic_title&quot; id=&quot;topic_title&quot; value=&quot;&quot; maxlength=&quot;100&quot; /&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;label&gt;&lt;?php _e( 'Content:', 'buddypress' ); ?&gt;&lt;/label&gt;
-                                &lt;textarea name=&quot;topic_text&quot; id=&quot;topic_text&quot;&gt;&lt;/textarea&gt;
</del><ins>+                                        &lt;label&gt;&lt;?php _e( 'Content:', 'buddypress' ); ?&gt;&lt;/label&gt;
+                                        &lt;textarea name=&quot;topic_text&quot; id=&quot;topic_text&quot;&gt;&lt;/textarea&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;label&gt;&lt;?php _e( 'Tags (comma separated):', 'buddypress' ); ?&gt;&lt;/label&gt;
-                                &lt;input type=&quot;text&quot; name=&quot;topic_tags&quot; id=&quot;topic_tags&quot; value=&quot;&quot; /&gt;
</del><ins>+                                        &lt;label&gt;&lt;?php _e( 'Tags (comma separated):', 'buddypress' ); ?&gt;&lt;/label&gt;
+                                        &lt;input type=&quot;text&quot; name=&quot;topic_tags&quot; id=&quot;topic_tags&quot; value=&quot;&quot; /&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;label&gt;&lt;?php _e( 'Post In Group Forum:', 'buddypress' ); ?&gt;&lt;/label&gt;
-                                &lt;select id=&quot;topic_group_id&quot; name=&quot;topic_group_id&quot;&gt;
</del><ins>+                                        &lt;label&gt;&lt;?php _e( 'Post In Group Forum:', 'buddypress' ); ?&gt;&lt;/label&gt;
+                                        &lt;select id=&quot;topic_group_id&quot; name=&quot;topic_group_id&quot;&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;option value=&quot;&quot;&gt;&lt;?php /* translators: no option picked in select box */ _e( '----', 'buddypress' ); ?&gt;&lt;/option&gt;
</del><ins>+                                                &lt;option value=&quot;&quot;&gt;&lt;?php /* translators: no option picked in select box */ _e( '----', 'buddypress' ); ?&gt;&lt;/option&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;?php while ( bp_groups() ) : bp_the_group(); ?&gt;
</del><ins>+                                                &lt;?php while ( bp_groups() ) : bp_the_group(); ?&gt;
</ins><span class="cx"> 
</span><del>-                                                &lt;?php if ( bp_group_is_forum_enabled() &amp;&amp; ( bp_current_user_can( 'bp_moderate' ) || 'public' == bp_get_group_status() || bp_group_is_member() ) ) : ?&gt;
</del><ins>+                                                        &lt;?php if ( bp_group_is_forum_enabled() &amp;&amp; ( bp_current_user_can( 'bp_moderate' ) || 'public' == bp_get_group_status() || bp_group_is_member() ) ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                                                        &lt;option value=&quot;&lt;?php bp_group_id(); ?&gt;&quot;&gt;&lt;?php bp_group_name(); ?&gt;&lt;/option&gt;
</del><ins>+                                                                &lt;option value=&quot;&lt;?php bp_group_id(); ?&gt;&quot;&gt;&lt;?php bp_group_name(); ?&gt;&lt;/option&gt;
</ins><span class="cx"> 
</span><del>-                                                &lt;?php endif; ?&gt;
</del><ins>+                                                        &lt;?php endif; ?&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;?php endwhile; ?&gt;
</del><ins>+                                                &lt;?php endwhile; ?&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;/select&gt;&lt;!-- #topic_group_id --&gt;
</del><ins>+                                        &lt;/select&gt;&lt;!-- #topic_group_id --&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;?php do_action( 'groups_forum_new_topic_after' ); ?&gt;
</del><ins>+                                        &lt;?php do_action( 'groups_forum_new_topic_after' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;div class=&quot;submit&quot;&gt;
-                                        &lt;input type=&quot;submit&quot; name=&quot;submit_topic&quot; id=&quot;submit&quot; value=&quot;&lt;?php _e( 'Post Topic', 'buddypress' ); ?&gt;&quot; /&gt;
-                                        &lt;input type=&quot;button&quot; name=&quot;submit_topic_cancel&quot; id=&quot;submit_topic_cancel&quot; value=&quot;&lt;?php _e( 'Cancel', 'buddypress' ); ?&gt;&quot; /&gt;
-                                &lt;/div&gt;
</del><ins>+                                        &lt;div class=&quot;submit&quot;&gt;
+                                                &lt;input type=&quot;submit&quot; name=&quot;submit_topic&quot; id=&quot;submit&quot; value=&quot;&lt;?php _e( 'Post Topic', 'buddypress' ); ?&gt;&quot; /&gt;
+                                                &lt;input type=&quot;button&quot; name=&quot;submit_topic_cancel&quot; id=&quot;submit_topic_cancel&quot; value=&quot;&lt;?php _e( 'Cancel', 'buddypress' ); ?&gt;&quot; /&gt;
+                                        &lt;/div&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;?php wp_nonce_field( 'bp_forums_new_topic' ); ?&gt;
</del><ins>+                                        &lt;?php wp_nonce_field( 'bp_forums_new_topic' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;/form&gt;&lt;!-- #forum-topic-form --&gt;
</del><ins>+                                &lt;/form&gt;&lt;!-- #forum-topic-form --&gt;
</ins><span class="cx"> 
</span><del>-                &lt;?php elseif ( bp_is_active( 'groups' ) ) : ?&gt;
</del><ins>+                        &lt;?php elseif ( bp_is_active( 'groups' ) ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;div id=&quot;message&quot; class=&quot;info&quot;&gt;
</del><ins>+                                &lt;div id=&quot;message&quot; class=&quot;info&quot;&gt;
</ins><span class="cx"> 
</span><del>-                                &lt;p&gt;&lt;?php printf( __( &quot;You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not &lt;a href='%s'&gt;create a new group&lt;/a&gt;? Once you have joined or created the group you can post your topic in that group's forum.&quot;, 'buddypress' ), site_url( bp_get_groups_root_slug() . '/create/' ) ); ?&gt;&lt;/p&gt;
</del><ins>+                                        &lt;p&gt;&lt;?php printf( __( &quot;You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not &lt;a href='%s'&gt;create a new group&lt;/a&gt;? Once you have joined or created the group you can post your topic in that group's forum.&quot;, 'buddypress' ), site_url( bp_get_groups_root_slug() . '/create/' ) ); ?&gt;&lt;/p&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;/div&gt;
</del><ins>+                                &lt;/div&gt;
</ins><span class="cx"> 
</span><ins>+                        &lt;?php endif; ?&gt;
+
</ins><span class="cx">                 &lt;?php endif; ?&gt;
</span><ins>+        &lt;/div&gt;&lt;!-- #new-topic-post --&gt;
</ins><span class="cx"> 
</span><del>-        &lt;?php endif; ?&gt;
-&lt;/div&gt;&lt;!-- #new-topic-post --&gt;
</del><ins>+        &lt;?php do_action( 'bp_after_new_topic_form' ); ?&gt;
</ins><span class="cx"> 
</span><del>-&lt;?php do_action( 'bp_after_new_topic_form' ); ?&gt;
-
-&lt;?php do_action( 'bp_after_directory_forums_content' ); ?&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+        &lt;?php do_action( 'bp_after_directory_forums_content' ); ?&gt;
+        
+&lt;/div&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbptemplatesbplegacycssbuddypresscss"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/css/buddypress.css (6826 => 6827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/css/buddypress.css        2013-03-01 20:57:30 UTC (rev 6826)
+++ trunk/bp-templates/bp-legacy/css/buddypress.css        2013-03-01 21:34:55 UTC (rev 6827)
</span><span class="lines">@@ -941,6 +941,7 @@
</span><span class="cx"> #buddypress table.forum {
</span><span class="cx">         margin: 0;
</span><span class="cx">         width: auto;
</span><ins>+        clear: both;
</ins><span class="cx"> }
</span><span class="cx"> #buddypress table.forum tr.sticky td {
</span><span class="cx">         font-size: 110%;
</span></span></pre>
</div>
</div>

</body>
</html>