Ticket #1613: 1613.diff

includes/topics/functions.php

@@ -1834 +1834 @@
                         }
 
                         // Attempt to update the tag
-                        $slug = !empty( $_POST['tag-slug'] ) ? $_POST['tag-slug'] : '';
-                        $tag  = wp_update_term( $tag_id, bbp_get_topic_tag_tax_id(), array( 'name' => $name, 'slug' => $slug ) );
+                        $slug        = !empty( $_POST['tag-slug'] ) ? $_POST['tag-slug'] : '';
+                        $description = !empty( $_POST['tag-description'] ) ? $_POST['tag-description'] : '';
+                        $tag         = wp_update_term( $tag_id, bbp_get_topic_tag_tax_id(), array( 'name' => $name, 'slug' => $slug, 'description' => $description ) );
 
                         // Cannot update tag
                         if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
@@ -1847 +1848 @@
                         $redirect = get_term_link( $tag_id, bbp_get_topic_tag_tax_id() );
 
                         // Update counts, etc...
-                        do_action( 'bbp_update_topic_tag', $tag_id, $tag, $name, $slug );
+                        do_action( 'bbp_update_topic_tag', $tag_id, $tag, $name, $slug, $description );
 
                         break;
 

templates/default/bbpress/content-archive-topic.php

@@ -23 +23 @@
 
         <?php bbp_breadcrumb(); ?>
 
-        <?php if ( bbp_is_topic_tag() ) bbp_topic_tag_description(); ?>
+        <?php do_action( 'bbp_template_before_topic_tag_description' ); ?>
 
+        <?php if ( bbp_is_topic_tag() ) : ?>
+
+                        <?php bbp_topic_tag_description( array( 'before' => '<div class="bbp-template-notice info">', 'after' => '</div>' ) ); ?>
+
+        <?php endif; ?>
+
+        <?php do_action( 'bbp_template_after_topic_tag_description' ); ?>
+
         <?php do_action( 'bbp_template_before_topics_index' ); ?>
 
         <?php if ( bbp_has_topics() ) : ?>

templates/default/bbpress/content-topic-tag-edit.php

@@ -13 +13 @@
 
         <?php bbp_breadcrumb(); ?>
 
+        <?php do_action( 'bbp_template_before_topic_tag_description' ); ?>
+
+        <?php bbp_topic_tag_description( array( 'before' => '<div class="bbp-template-notice info">', 'after' => '</div>' ) ); ?>
+
+        <?php do_action( 'bbp_template_after_topic_tag_description' ); ?>
+
         <?php bbp_topic_tag_description(); ?>
 
         <?php do_action( 'bbp_template_before_topic_tag_edit' ); ?>

templates/default/bbpress/form-topic-tag.php

@@ -41 +41 @@
                                                 <input type="text" id="tag-slug" name="tag-slug" size="20" maxlength="40" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( apply_filters( 'editable_slug', bbp_get_topic_tag_slug() ) ); ?>" />
                                         </div>
 
+                                        <div>
+                                                <label for="tag-description"><?php _e( 'Description:', 'bbpress' ); ?></label>
+                                                <input type="text" id="tag-description" name="tag-description" size="20" maxlength="40" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( bbp_get_topic_tag_description( array( 'before' => '', 'after' => '' ) ) ); ?>" />
+                                        </div>
+
                                         <div class="bbp-submit-wrapper">
                                                 <button type="submit" tabindex="<?php bbp_tab_index(); ?>" class="button submit"><?php esc_attr_e( 'Update', 'bbpress' ); ?></button>