<!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] [3347] trunk:
Better handling of error messages during the creation of forum topics.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3347</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-03 23:55:29 +0000 (Wed, 03 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better handling of error messages during the creation of forum topics. Fixes #947</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (3346 => 3347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php 2010-11-03 23:14:43 UTC (rev 3346)
+++ trunk/bp-forums.php 2010-11-03 23:55:29 UTC (rev 3347)
</span><span class="lines">@@ -66,12 +66,26 @@
</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"> if ( $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) ) {
</span><del>- if ( !$topic = groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) )
- bp_core_add_message( __( 'There was an error when creating the topic', 'buddypress'), 'error' );
- else
- bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
-
- bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug . '/' );
</del><ins>+ if ( empty( $_POST['topic_title'] ) )
+ $error_message = __( 'Please provide a title for your forum topic.', 'buddypress' );
+ else if ( empty( $_POST['topic_text'] ) )
+ $error_message = __( 'Forum posts cannot be empty. Please enter some text.', 'buddypress' );
+
+ if ( $error_message ) {
+ bp_core_add_message( $error_message, 'error' );
+ $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum';
+ } else {
+ if ( !$topic = groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) ) {
+ bp_core_add_message( __( 'There was an error when creating the topic', 'buddypress'), 'error' );
+ $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum';
+ } else {
+ bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
+ $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
+ }
+ }
+
+ bp_core_redirect( $redirect );
+
</ins><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><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3346 => 3347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-11-03 23:14:43 UTC (rev 3346)
+++ trunk/bp-groups.php 2010-11-03 23:55:29 UTC (rev 3347)
</span><span class="lines">@@ -476,12 +476,26 @@
</span><span class="cx"> if ( $bp->groups->auto_join && !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->loggedin_user->id );
</span><span class="cx">
</span><del>- if ( !$topic = groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) )
- bp_core_add_message( __( 'There was an error when creating the topic', 'buddypress'), 'error' );
- else
- bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
-
- bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' );
</del><ins>+ if ( empty( $_POST['topic_title'] ) )
+ $error_message = __( 'Please provide a title for your forum topic.', 'buddypress' );
+ else if ( empty( $_POST['topic_text'] ) )
+ $error_message = __( 'Forum posts cannot be empty. Please enter some text.', 'buddypress' );
+
+ if ( $error_message ) {
+ bp_core_add_message( $error_message, 'error' );
+ $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum';
+ } else {
+ if ( !$topic = groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) ) {
+ bp_core_add_message( __( 'There was an error when creating the topic', 'buddypress'), 'error' );
+ $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum';
+ } else {
+ bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
+ $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
+ }
+ }
+
+ bp_core_redirect( $redirect );
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_screen_group_forum', $topic_id, $forum_id );
</span></span></pre>
</div>
</div>
</body>
</html>