Changeset 4147

Timestamp:

03/23/2011 08:36:24 PM (12 years ago)

Author:

boonebgorges

Message:

Adds tag editing field to Topic Edit screen. References #2281

Location:

trunk

Files:

• bp-forums/bp-forums-functions.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (1 diff)
• bp-groups/bp-groups-forums.php (modified) (2 diffs)
• bp-groups/bp-groups-screens.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/forum/edit.php (modified) (1 diff)

trunk/bp-forums/bp-forums-functions.php

@@ -186 +186 @@
         'topic_id'    => false,
         'topic_title' => '',
-        'topic_text'  => ''
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    if ( !$topic_id = bb_insert_topic( array( 'topic_id' => $topic_id, 'topic_title' => stripslashes( $topic_title ) ) ) )
+        'topic_text'  => '',
+        'topic_tags'  => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    if ( !$topic_id = bb_insert_topic( array( 'topic_id' => $topic_id, 'topic_title' => stripslashes( $topic_title ), 'tags' => $topic_tags ) ) )
         return false;
 

trunk/bp-forums/bp-forums-template.php

@@ -1174 +1174 @@
 }
 
+/**
+ * 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 );
+    }
+
 function bp_forum_action() {
     echo bp_get_forum_action();

trunk/bp-groups/bp-groups-forums.php

@@ -112 +112 @@
 }
 
-function groups_update_group_forum_topic( $topic_id, $topic_title, $topic_text ) {
+function groups_update_group_forum_topic( $topic_id, $topic_title, $topic_text, $topic_tags = false ) {
     global $bp;
 
@@ -118 +118 @@
     $topic_text  = apply_filters( 'group_forum_topic_text_before_save',  $topic_text  );
 
-    if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
+    if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id, 'topic_tags' => $topic_tags ) ) ) {
         // Update the activity stream item
         if ( bp_is_active( 'activity' ) )

trunk/bp-groups/bp-groups-screens.php

@@ -232 +232 @@
                     check_admin_referer( 'bp_forums_edit_topic' );
 
-                    if ( !groups_update_group_forum_topic( $topic_id, $_POST['topic_title'], $_POST['topic_text'] ) )
+                    $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 ) )
                         bp_core_add_message( __( 'There was an error when editing that topic', 'buddypress'), 'error' );
                     else

trunk/bp-themes/bp-default/groups/single/forum/edit.php

@@ -52 +52 @@
                     <label for="topic_text"><?php _e( 'Content:', 'buddypress' ); ?></label>
                     <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea>
+                    
+                    <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
+                    <input type="text" name="topic_tags" id="topic_tags" value="<?php bp_forum_topic_tag_list() ?>" />
 
                     <?php do_action( 'bp_group_after_edit_forum_topic' ); ?>