<!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][4232] trunk: Fix logic when posting a topic from the forum directory, so that validation errors are shown.</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>4232</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-22 14:51:12 +0000 (Fri, 22 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix logic when posting a topic from the forum directory, so that validation errors are shown. Show post form automatically if form validation failed. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsscreensphp">trunk/bp-forums/bp-forums-screens.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultforumsindexphp">trunk/bp-themes/bp-default/forums/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-screens.php (4231 => 4232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-screens.php 2011-04-22 13:30:29 UTC (rev 4231)
+++ trunk/bp-forums/bp-forums-screens.php 2011-04-22 14:51:12 UTC (rev 4232)
</span><span class="lines">@@ -20,13 +20,16 @@
</span><span class="cx"> if ( isset( $_POST['submit_topic'] ) && bp_is_active( 'forums' ) ) {
</span><span class="cx"> check_admin_referer( 'bp_forums_new_topic' );
</span><span class="cx">
</span><del>- if ( $bp->groups->current_group = groups_get_group( array( 'group_id' => $_POST['topic_group_id'] ) ) ) {
</del><ins>+ $bp->groups->current_group = groups_get_group( array( 'group_id' => $_POST['topic_group_id'] ) );
+ if ( !empty( $bp->groups->current_group->id ) ) {
</ins><span class="cx"> // Auto join this user if they are not yet a member of this group
</span><span class="cx"> if ( !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
</span><span class="cx"> groups_join_group( $bp->groups->current_group->id, $bp->groups->current_group->id );
</span><span class="cx">
</span><span class="cx"> $error_message = '';
</span><del>- if ( $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) ) {
</del><ins>+
+ $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
+ if ( !empty( $forum_id ) ) {
</ins><span class="cx"> if ( empty( $_POST['topic_title'] ) )
</span><span class="cx"> $error_message = __( 'Please provide a title for your forum topic.', 'buddypress' );
</span><span class="cx"> else if ( empty( $_POST['topic_text'] ) )
</span><span class="lines">@@ -49,7 +52,12 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> bp_core_add_message( __( 'Please pick the group forum where you would like to post this topic.', 'buddypress' ), 'error' );
</span><ins>+ bp_core_redirect( add_query_arg( 'new', '', bp_get_forum_directory_permalink() ) );
</ins><span class="cx"> }
</span><ins>+
+ } else {
+ bp_core_add_message( __( 'Please pick the group forum where you would like to post this topic.', 'buddypress' ), 'error' );
+ bp_core_redirect( add_query_arg( 'new', '', bp_get_forum_directory_permalink() ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (4231 => 4232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2011-04-22 13:30:29 UTC (rev 4231)
+++ trunk/bp-themes/bp-default/_inc/global.js 2011-04-22 14:51:12 UTC (rev 4232)
</span><span class="lines">@@ -8,8 +8,10 @@
</span><span class="cx"> /**** Page Load Actions *******************************************************/
</span><span class="cx">
</span><span class="cx"> /* Hide Forums Post Form */
</span><del>- if ( jq('div.forums').length )
</del><ins>+ if ( '-1' == window.location.search.indexOf('new') && jq('div.forums').length )
</ins><span class="cx"> jq('div#new-topic-post').hide();
</span><ins>+ else
+ jq('div#new-topic-post').show();
</ins><span class="cx">
</span><span class="cx"> /* Activity filter and scope set */
</span><span class="cx"> bp_init_activity();
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/index.php (4231 => 4232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/index.php 2011-04-22 13:30:29 UTC (rev 4231)
+++ trunk/bp-themes/bp-default/forums/index.php 2011-04-22 14:51:12 UTC (rev 4232)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_new_topic_form' ); ?>
</span><span class="cx">
</span><del>- <div id="new-topic-post" style="display: none;">
</del><ins>+ <div id="new-topic-post">
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -100,6 +100,8 @@
</span><span class="cx"> <a name="post-new"></a>
</span><span class="cx"> <h5><?php _e( 'Create New Topic:', 'buddypress' ); ?></h5>
</span><span class="cx">
</span><ins>+ <?php do_action( 'template_notices' ); ?>
+
</ins><span class="cx"> <label><?php _e( 'Title:', 'buddypress' ); ?></label>
</span><span class="cx"> <input type="text" name="topic_title" id="topic_title" value="" />
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>