Changeset 5835 for trunk/src/includes/topics/template.php

Timestamp:

07/15/2015 04:30:34 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Moderators: Introduce none argument for topic-tags & forum-mods list functions.

This change allows for passing text or HTML to output if no taxonomy terms are found, and uses this new functionality in wp-admin to show per-forum moderators in the list-table column, also reducing code duplication.

See #459.

File:

• trunk/src/includes/topics/template.php (modified) (5 diffs)

trunk/src/includes/topics/template.php

@@ -2358 +2358 @@
  * Output a the tags of a topic
  *
+ * @since bbPress (r2688)
+ *
  * @param int $topic_id Optional. Topic id
  * @param array $args See {@link bbp_get_topic_tag_list()}
@@ -2367 +2369 @@
     /**
      * Return the tags of a topic
+     *
+     * @since bbPress (r2688)
      *
      * @param int $topic_id Optional. Topic id
@@ -2381 +2385 @@
         // Bail if topic-tags are off
         if ( ! bbp_allow_topic_tags() ) {
-            return;
+            return '';
         }
 
@@ -2388 +2392 @@
             'before' => '<div class="bbp-topic-tags"><p>' . esc_html__( 'Tagged:', 'bbpress' ) . '&nbsp;',
             'sep'    => ', ',
-            'after'  => '</p></div>'
+            'after'  => '</p></div>',
+            'none'   => ''
         ), 'get_topic_tag_list' );
 
@@ -2399 +2404 @@
             $terms = get_post_meta( $topic_id, '_bbp_spam_topic_tags', true );
 
-            // If terms exist, explode them and compile the return value
+            // If terms exist, implode them and compile the return value
             if ( ! empty( $terms ) ) {
                 $terms  = implode( $r['sep'], $terms );
                 $retval = $r['before'] . $terms . $r['after'];
-
-            // No terms so return emty string
-            } else {
-                $retval = '';
             }
 
         // Topic is not spam so display a clickable term list
         } else {
-            $retval = get_the_term_list( $topic_id, bbp_get_topic_tag_tax_id(), $r['before'], $r['sep'], $r['after'] );
+            $terms = get_the_term_list( $topic_id, bbp_get_topic_tag_tax_id(), $r['before'], $r['sep'], $r['after'] );
+        }
+
+        // No terms so return none string
+        if ( empty( $terms ) ) {
+            $retval = $r['none'];
         }