Changeset 5310

Timestamp:

03/05/2014 07:08:27 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Allow topic-tag descriptions to be edited theme-side. Props netweb. Fixes #1613.

Location:

trunk/src

Files:

• includes/topics/functions.php (modified) (2 diffs)
• templates/default/bbpress/content-archive-topic.php (modified) (1 diff)
• templates/default/bbpress/content-topic-tag-edit.php (modified) (1 diff)
• templates/default/bbpress/form-topic-tag.php (modified) (1 diff)

trunk/src/includes/topics/functions.php

@@ -1835 +1835 @@
 
             // 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
@@ -1848 +1849 @@
 
             // 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;

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

@@ -24 +24 @@
     <?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"><p>', 'after' => '</p></div>' ) ); ?>
+
+    <?php endif; ?>
+
+    <?php do_action( 'bbp_template_after_topic_tag_description' ); ?>
 
     <?php do_action( 'bbp_template_before_topics_index' ); ?>

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

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

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

@@ -40 +40 @@
                         <label for="tag-slug"><?php _e( 'Slug:', 'bbpress' ); ?></label>
                         <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" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( bbp_get_topic_tag_description( array( 'before' => '', 'after' => '' ) ) ); ?>" />
                     </div>