<!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] [2969] branches/1.2/bp-themes/bp-default/forums/index.php:
  Fixes #2346 props boonebgorges</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2969</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-28 22:16:57 +0000 (Wed, 28 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #2346 props boonebgorges</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpthemesbpdefaultforumsindexphp">branches/1.2/bp-themes/bp-default/forums/index.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/forums/index.php (2968 => 2969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/forums/index.php        2010-04-28 21:54:41 UTC (rev 2968)
+++ branches/1.2/bp-themes/bp-default/forums/index.php        2010-04-28 22:16:57 UTC (rev 2969)
</span><span class="lines">@@ -14,58 +14,64 @@
</span><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;/form&gt;
</span><span class="cx"> 
</span><del>-                        &lt;div id=&quot;new-topic-post&quot;&gt;
-                                &lt;?php if ( is_user_logged_in() ) : ?&gt;
</del><ins>+                &lt;div id=&quot;new-topic-post&quot;&gt;
+                        &lt;?php if ( is_user_logged_in() ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;?php if ( 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_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( 'Post a 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( 'Post a New Topic:', 'buddypress' ) ?&gt;&lt;/h5&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; /&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; /&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;
-                                                                &lt;?php while ( bp_groups() ) : bp_the_group(); ?&gt;
-                                                                        &lt;?php if ( 'public' == bp_get_group_status() ) : ?&gt;
-                                                                                &lt;option value=&quot;&lt;?php bp_group_id() ?&gt;&quot;&gt;&lt;?php bp_group_name() ?&gt;&lt;/option&gt;
-                                                                        &lt;?php endif; ?&gt;
-                                                                &lt;?php endwhile; ?&gt;
-                                                        &lt;/select&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;?php do_action( 'groups_forum_new_topic_after' ) ?&gt;
</del><ins>+                                                        &lt;?php while ( bp_groups() ) : bp_the_group(); ?&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;?php if ( bp_group_is_forum_enabled() &amp;&amp; 'public' == bp_get_group_status() ) : ?&gt;
</ins><span class="cx"> 
</span><del>-                                                        &lt;?php wp_nonce_field( 'bp_forums_new_topic' ) ?&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;/form&gt;
</del><ins>+                                                                &lt;?php endif; ?&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;?php else : ?&gt;
</del><ins>+                                                        &lt;?php endwhile; ?&gt;
</ins><span class="cx"> 
</span><del>-                                                &lt;div id=&quot;message&quot; class=&quot;info&quot;&gt;
-                                                        &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_GROUPS_SLUG . '/create/' ) ) ?&gt;&lt;/p&gt;
</del><ins>+                                                &lt;/select&gt;&lt;!-- #topic_group_id --&gt;
+
+                                                &lt;?php do_action( 'groups_forum_new_topic_after' ) ?&gt;
+
+                                                &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;
</ins><span class="cx">                                                 &lt;/div&gt;
</span><span class="cx"> 
</span><del>-                                        &lt;?php endif; ?&gt;
</del><ins>+                                                &lt;?php wp_nonce_field( 'bp_forums_new_topic' ) ?&gt;
</ins><span class="cx"> 
</span><ins>+                                        &lt;/form&gt;&lt;!-- #forum-topic-form --&gt;
+
+                                &lt;?php else : ?&gt;
+
+                                        &lt;div id=&quot;message&quot; class=&quot;info&quot;&gt;
+                                                &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_GROUPS_SLUG . '/create/' ) ) ?&gt;&lt;/p&gt;
+                                        &lt;/div&gt;
+
</ins><span class="cx">                                 &lt;?php endif; ?&gt;
</span><del>-                        &lt;/div&gt;
</del><span class="cx"> 
</span><ins>+                        &lt;?php endif; ?&gt;
+                &lt;/div&gt;&lt;!-- #new-topic-post --&gt;
+
</ins><span class="cx">                 &lt;form action=&quot;&quot; method=&quot;post&quot; id=&quot;forums-directory-form&quot; class=&quot;dir-form&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;div class=&quot;item-list-tabs&quot;&gt;
</span></span></pre>
</div>
</div>

</body>
</html>