<!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][4147] trunk: Adds tag editing field to Topic Edit screen.</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>4147</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-03-23 20:36:24 +0000 (Wed, 23 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds tag editing field to Topic Edit screen. References #2281</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsfunctionsphp">trunk/bp-forums/bp-forums-functions.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsforumsphp">trunk/bp-groups/bp-groups-forums.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumeditphp">trunk/bp-themes/bp-default/groups/single/forum/edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-functions.php (4146 => 4147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-functions.php 2011-03-23 19:30:32 UTC (rev 4146)
+++ trunk/bp-forums/bp-forums-functions.php 2011-03-23 20:36:24 UTC (rev 4147)
</span><span class="lines">@@ -185,13 +185,14 @@
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'topic_id' => false,
</span><span class="cx"> 'topic_title' => '',
</span><del>- 'topic_text' => ''
</del><ins>+ 'topic_text' => '',
+ 'topic_tags' => false
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- if ( !$topic_id = bb_insert_topic( array( 'topic_id' => $topic_id, 'topic_title' => stripslashes( $topic_title ) ) ) )
</del><ins>+ if ( !$topic_id = bb_insert_topic( array( 'topic_id' => $topic_id, 'topic_title' => stripslashes( $topic_title ), 'tags' => $topic_tags ) ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !$post = bb_get_first_post( $topic_id ) )
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (4146 => 4147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-03-23 19:30:32 UTC (rev 4146)
+++ trunk/bp-forums/bp-forums-template.php 2011-03-23 20:36:24 UTC (rev 4147)
</span><span class="lines">@@ -1173,6 +1173,42 @@
</span><span class="cx"> bb_tag_heat_map( $smallest, $largest, $sizing, $limit );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Echo the current topic's tag list, comma-separated
+ *
+ * @package BuddyPress
+ * @since 1.3
+ */
+function bp_forum_topic_tag_list() {
+ echo bp_get_forum_topic_tag_list();
+}
+ /**
+ * Get the current topic's tag list
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @param str $format 'string' returns comma-separated string; otherwise returns array
+ * @return mixed $tags
+ */
+ function bp_get_forum_topic_tag_list( $format = 'string' ) {
+ do_action( 'bbpress_init' );
+
+ // Pull up the tag objects
+ $tags_data = bb_get_topic_tags( bp_get_the_topic_id() );
+
+ // Convert them to a comma-separated string
+ $tags = array();
+ foreach( $tags_data as $tag_data ) {
+ $tags[] = $tag_data->name;
+ }
+
+ if ( 'string' == $format )
+ $tags = implode( ', ', $tags );
+
+ return apply_filters( 'bp_forum_topic_tag_list', $tags, $format );
+ }
+
</ins><span class="cx"> function bp_forum_action() {
</span><span class="cx"> echo bp_get_forum_action();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-forums.php (4146 => 4147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-forums.php 2011-03-23 19:30:32 UTC (rev 4146)
+++ trunk/bp-groups/bp-groups-forums.php 2011-03-23 20:36:24 UTC (rev 4147)
</span><span class="lines">@@ -111,13 +111,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_update_group_forum_topic( $topic_id, $topic_title, $topic_text ) {
</del><ins>+function groups_update_group_forum_topic( $topic_id, $topic_title, $topic_text, $topic_tags = false ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $topic_title = apply_filters( 'group_forum_topic_title_before_save', $topic_title );
</span><span class="cx"> $topic_text = apply_filters( 'group_forum_topic_text_before_save', $topic_text );
</span><span class="cx">
</span><del>- if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
</del><ins>+ if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id, 'topic_tags' => $topic_tags ) ) ) {
</ins><span class="cx"> // Update the activity stream item
</span><span class="cx"> if ( bp_is_active( 'activity' ) )
</span><span class="cx"> bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (4146 => 4147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-03-23 19:30:32 UTC (rev 4146)
+++ trunk/bp-groups/bp-groups-screens.php 2011-03-23 20:36:24 UTC (rev 4147)
</span><span class="lines">@@ -231,7 +231,9 @@
</span><span class="cx"> // Check the nonce
</span><span class="cx"> check_admin_referer( 'bp_forums_edit_topic' );
</span><span class="cx">
</span><del>- if ( !groups_update_group_forum_topic( $topic_id, $_POST['topic_title'], $_POST['topic_text'] ) )
</del><ins>+ $topic_tags = !empty( $_POST['topic_tags'] ) ? $_POST['topic_tags'] : false;
+
+ if ( !groups_update_group_forum_topic( $topic_id, $_POST['topic_title'], $_POST['topic_text'], $topic_tags ) )
</ins><span class="cx"> bp_core_add_message( __( 'There was an error when editing that topic', 'buddypress'), 'error' );
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __( 'The topic was edited successfully', 'buddypress') );
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumeditphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum/edit.php (4146 => 4147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum/edit.php 2011-03-23 19:30:32 UTC (rev 4146)
+++ trunk/bp-themes/bp-default/groups/single/forum/edit.php 2011-03-23 20:36:24 UTC (rev 4147)
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx">
</span><span class="cx"> <label for="topic_text"><?php _e( 'Content:', 'buddypress' ); ?></label>
</span><span class="cx"> <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea>
</span><ins>+
+ <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
+ <input type="text" name="topic_tags" id="topic_tags" value="<?php bp_forum_topic_tag_list() ?>" />
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_group_after_edit_forum_topic' ); ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>