Changeset 4166

Timestamp:

08/21/2012 07:11:11 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Topic Tags:

• When posting a topic or reply, check that user can assign tags to topics.
• If user cannot assign tags, and topic-tag value is not set, use existing topic tags.

Location:

branches/plugin/bbp-includes

Files:

• bbp-reply-functions.php (modified) (2 diffs)
• bbp-topic-functions.php (modified) (4 diffs)

branches/plugin/bbp-includes/bbp-reply-functions.php

@@ -224 +224 @@
         /** Topic Tags ************************************************************/
 
-        if ( !empty( $_POST['bbp_topic_tags'] ) )
+        // Either replace terms
+        if ( bbp_allow_topic_tags() && current_user_can( 'assign_topic_tags' ) && ! empty( $_POST['bbp_topic_tags'] ) ) {
                 $terms = esc_attr( strip_tags( $_POST['bbp_topic_tags'] ) );
+
+        // ...or remove them.
+        } elseif ( isset( $_POST['bbp_topic_tags'] ) ) {
+                $terms = '';
+
+        // Existing terms
+        } else {
+                $terms = bbp_get_topic_tag_names( $topic_id );
+        }
 
         /** Additional Actions (Before Save) **************************************/
@@ -486 +496 @@
         /** Topic Tags ************************************************************/
 
-        if ( !empty( $_POST['bbp_topic_tags'] ) )
+        // Either replace terms
+        if ( bbp_allow_topic_tags() && current_user_can( 'assign_topic_tags' ) && ! empty( $_POST['bbp_topic_tags'] ) ) {
                 $terms = esc_attr( strip_tags( $_POST['bbp_topic_tags'] ) );
+
+        // ...or remove them.
+        } elseif ( isset( $_POST['bbp_topic_tags'] ) ) {
+                $terms = '';
+
+        // Existing terms
+        } else {
+                $terms = bbp_get_topic_tag_names( $topic_id );
+        }
 
         /** Additional Actions (Before Save) **************************************/

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -430 +430 @@
         $topic = $topic_id = $forum_id = $anonymous_data = 0;
         $topic_title = $topic_content = $topic_edit_reason = '';
-        $terms = array( bbp_get_topic_tag_tax_id() => array() );
 
         /** Topic *****************************************************************/
@@ -552 +551 @@
         /** Topic Tags ************************************************************/
 
-        // Tags
-        if ( bbp_allow_topic_tags() && !empty( $_POST['bbp_topic_tags'] ) ) {
+        // Either replace terms
+        if ( bbp_allow_topic_tags() && current_user_can( 'assign_topic_tags' ) && ! empty( $_POST['bbp_topic_tags'] ) ) {
 
                 // Escape tag input
@@ -564 +563 @@
                 // Add topic tag ID as main key
                 $terms = array( bbp_get_topic_tag_tax_id() => $terms );
+
+        // ...or remove them.
+        } elseif ( isset( $_POST['bbp_topic_tags'] ) ) {
+                $terms = array( bbp_get_topic_tag_tax_id() => array() );
+
+        // Existing terms
+        } else {
+                $terms = array( bbp_get_topic_tag_tax_id() => explode( ',', bbp_get_topic_tag_names( $topic_id, ',' ) ) );
         }
 
@@ -3069 +3076 @@
 }
 
+/** Topic Tags ****************************************************************/
+
+/**
+ * Get topic tags for a specific topic ID
+ *
+ * @since bbPress (r4165)
+ *
+ * @param int $topic_id
+ * @param string $sep
+ * @return string
+ */
+function bbp_get_topic_tag_names( $topic_id = 0, $sep = ', ' ) {
+        $topic_id   = bbp_get_topic_id( $topic_id );
+        $topic_tags = array_filter( (array) get_the_terms( $topic_id, bbp_get_topic_tag_tax_id() ) );
+        $terms      = array();
+        foreach( $topic_tags as $term ) {
+                $terms[] = $term->name;
+        }
+        $terms = !empty( $terms ) ? implode( $sep, $terms ) : '';
+
+        return apply_filters( 'bbp_get_topic_tags', $terms, $topic_id );
+}
+
 /** Autoembed *****************************************************************/