<!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">                         </div>
</span><span class="cx">                 </form>
</span><span class="cx">
</span><del>-                        <div id="new-topic-post">
-                                <?php if ( is_user_logged_in() ) : ?>
</del><ins>+                <div id="new-topic-post">
+                        <?php if ( is_user_logged_in() ) : ?>
</ins><span class="cx">
</span><del>-                                        <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100' ) ) : ?>
</del><ins>+                                <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100' ) ) : ?>
</ins><span class="cx">
</span><del>-                                                <form action="" method="post" id="forum-topic-form" class="standard-form">
</del><ins>+                                        <form action="" method="post" id="forum-topic-form" class="standard-form">
</ins><span class="cx">
</span><del>-                                                        <?php do_action( 'groups_forum_new_topic_before' ) ?>
</del><ins>+                                                <?php do_action( 'groups_forum_new_topic_before' ) ?>
</ins><span class="cx">
</span><del>-                                                        <a name="post-new"></a>
-                                                        <h5><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h5>
</del><ins>+                                                <a name="post-new"></a>
+                                                <h5><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h5>
</ins><span class="cx">
</span><del>-                                                        <label><?php _e( 'Title:', 'buddypress' ) ?></label>
-                                                        <input type="text" name="topic_title" id="topic_title" value="" />
</del><ins>+                                                <label><?php _e( 'Title:', 'buddypress' ) ?></label>
+                                                <input type="text" name="topic_title" id="topic_title" value="" />
</ins><span class="cx">
</span><del>-                                                        <label><?php _e( 'Content:', 'buddypress' ) ?></label>
-                                                        <textarea name="topic_text" id="topic_text"></textarea>
</del><ins>+                                                <label><?php _e( 'Content:', 'buddypress' ) ?></label>
+                                                <textarea name="topic_text" id="topic_text"></textarea>
</ins><span class="cx">
</span><del>-                                                        <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
-                                                        <input type="text" name="topic_tags" id="topic_tags" value="" />
</del><ins>+                                                <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
+                                                <input type="text" name="topic_tags" id="topic_tags" value="" />
</ins><span class="cx">
</span><del>-                                                        <label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
-                                                        <select id="topic_group_id" name="topic_group_id">
-                                                                <?php while ( bp_groups() ) : bp_the_group(); ?>
-                                                                        <?php if ( 'public' == bp_get_group_status() ) : ?>
-                                                                                <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
-                                                                        <?php endif; ?>
-                                                                <?php endwhile; ?>
-                                                        </select>
</del><ins>+                                                <label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
+                                                <select id="topic_group_id" name="topic_group_id">
</ins><span class="cx">
</span><del>-                                                        <?php do_action( 'groups_forum_new_topic_after' ) ?>
</del><ins>+                                                        <?php while ( bp_groups() ) : bp_the_group(); ?>
</ins><span class="cx">
</span><del>-                                                        <div class="submit">
-                                                                <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />
-                                                                <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ) ?>" />
-                                                        </div>
</del><ins>+                                                                <?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?>
</ins><span class="cx">
</span><del>-                                                        <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
</del><ins>+                                                                        <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
</ins><span class="cx">
</span><del>-                                                </form>
</del><ins>+                                                                <?php endif; ?>
</ins><span class="cx">
</span><del>-                                        <?php else : ?>
</del><ins>+                                                        <?php endwhile; ?>
</ins><span class="cx">
</span><del>-                                                <div id="message" class="info">
-                                                        <p><?php printf( __( "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 <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( BP_GROUPS_SLUG . '/create/' ) ) ?></p>
</del><ins>+                                                </select><!-- #topic_group_id -->
+
+                                                <?php do_action( 'groups_forum_new_topic_after' ) ?>
+
+                                                <div class="submit">
+                                                        <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />
+                                                        <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ) ?>" />
</ins><span class="cx">                                                 </div>
</span><span class="cx">
</span><del>-                                        <?php endif; ?>
</del><ins>+                                                <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
</ins><span class="cx">
</span><ins>+                                        </form><!-- #forum-topic-form -->
+
+                                <?php else : ?>
+
+                                        <div id="message" class="info">
+                                                <p><?php printf( __( "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 <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( BP_GROUPS_SLUG . '/create/' ) ) ?></p>
+                                        </div>
+
</ins><span class="cx">                                 <?php endif; ?>
</span><del>-                        </div>
</del><span class="cx">
</span><ins>+                        <?php endif; ?>
+                </div><!-- #new-topic-post -->
+
</ins><span class="cx">                 <form action="" method="post" id="forums-directory-form" class="dir-form">
</span><span class="cx">
</span><span class="cx">                         <div class="item-list-tabs">
</span></span></pre>
</div>
</div>
</body>
</html>