Changeset 5841

Timestamp:

07/15/2015 06:18:28 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Moderation: Fix some copy-pasta and make sure form terms are formatted correctly. See #459.

Location:

trunk/src/includes

Files:

• forums/functions.php (modified) (1 diff)
• forums/template.php (modified) (1 diff)
• topics/template.php (modified) (5 diffs)

trunk/src/includes/forums/functions.php

@@ -1734 +1734 @@
  */
 function bbp_get_forum_mod_names( $forum_id = 0, $sep = ', ' ) {
-    $forum_mods = bbp_get_topic_tags( $forum_id );
+    $forum_mods = bbp_get_forum_mods( $forum_id );
     $pluck      = wp_list_pluck( $forum_mods, 'name' );
     $terms      = ! empty( $pluck ) ? implode( $sep, $pluck ) : '';

trunk/src/includes/forums/template.php

@@ -492 +492 @@
         } elseif ( bbp_is_single_forum() || bbp_is_forum_edit() ) {
 
-            $forum_id = get_the_ID();
+            // Get the forum ID
+            $forum_id = bbp_get_forum_id( get_the_ID() );
 
             // Forum exists
             if ( ! empty( $forum_id ) ) {
-                $new_terms = bbp_get_forum_mod_names( $forum_id );
-
-            // Define local variable(s)
-            } else {
-                $new_terms = '';
+                $forum_mods = bbp_get_forum_mod_names( $forum_id );
             }
-
-            // Set the return value
-            $forum_mods = ( ! empty( $new_terms ) ) ? implode( ', ', $new_terms ) : '';
 
         // No data

trunk/src/includes/topics/template.php

@@ -2406 +2406 @@
             // If terms exist, implode them and compile the return value
             if ( ! empty( $terms ) ) {
-                $terms  = implode( $r['sep'], $terms );
-                $retval = $r['before'] . $terms . $r['after'];
+                $terms = $r['before'] . implode( $r['sep'], $terms ) . $r['after'];
             }
 
@@ -2416 +2415 @@
 
         // No terms so return none string
-        if ( empty( $terms ) ) {
+        if ( ! empty( $terms ) ) {
+            $retval = $terms;
+        } else {
             $retval = $r['none'];
         }
@@ -3960 +3961 @@
     function bbp_get_form_topic_tags() {
 
+        // Default return value
+        $topic_tags = '';
+
         // Get _POST data
         if ( ( bbp_is_topic_form_post_request() || bbp_is_reply_form_post_request() ) && isset( $_POST['bbp_topic_tags'] ) ) {
@@ -3972 +3976 @@
                 // Post is a topic
                 case bbp_get_topic_post_type() :
-                    $topic_id = get_the_ID();
+                    $topic_id = bbp_get_topic_id( get_the_ID() );
                     break;
 
@@ -3988 +3992 @@
 
                     // Get pre-spam terms
-                    $new_terms = get_post_meta( $topic_id, '_bbp_spam_topic_tags', true );
-
-                    // If terms exist, explode them and compile the return value
-                    if ( empty( $new_terms ) ) {
-                        $new_terms = '';
-                    }
+                    $spam_terms = get_post_meta( $topic_id, '_bbp_spam_topic_tags', true );
+                    $topic_tags = ( ! empty( $spam_terms ) ) ? implode( ', ', $spam_terms ) : '';
 
                 // Topic is not spam so get real terms
                 } else {
-                    $terms = array_filter( (array) get_the_terms( $topic_id, bbp_get_topic_tag_tax_id() ) );
-
-                    // Loop through them
-                    foreach ( $terms as $term ) {
-                        $new_terms[] = $term->name;
-                    }
+                    $topic_tags = bbp_get_topic_tag_names( $topic_id );
                 }
-
-            // Define local variable(s)
-            } else {
-                $new_terms = '';
             }
-
-            // Set the return value
-            $topic_tags = ( ! empty( $new_terms ) ) ? implode( ', ', $new_terms ) : '';
-
-        // No data
-        } else {
-            $topic_tags = '';
         }