Changeset 5513

Timestamp:

09/11/2014 03:49:07 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Simplify topic & reply author role markup arguments, with backpat support. Props netweb. Fixes #2557.

Location:

trunk/src/includes

Files:

• replies/template.php (modified) (1 diff)
• topics/template.php (modified) (1 diff)

trunk/src/includes/replies/template.php

@@ -1434 +1434 @@
         $r = bbp_parse_args( $args, array(
             'reply_id' => 0,
-            'class'    => 'bbp-author-role',
-            'before'   => '',
-            'after'    => ''
+            'class'    => false,
+            'before'   => '<div class="bbp-author-role">',
+            'after'    => '</div>'
         ), 'get_reply_author_role' );
 
         $reply_id    = bbp_get_reply_id( $r['reply_id'] );
         $role        = bbp_get_user_display_role( bbp_get_reply_author_id( $reply_id ) );
-        $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], esc_attr( $r['class'] ), esc_html( $role ), $r['after'] );
+
+        // Backwards compatibilty with old 'class' argument
+        if ( ! empty( $r['class'] ) ) {
+            $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], esc_attr( $r['class'] ), esc_html( $role ), $r['after'] );
+
+        // Simpler before & after arguments
+        // https://bbpress.trac.wordpress.org/ticket/2557
+        } else {
+            $author_role = $r['before'] . $role . $r['after'];
+        }
 
         return apply_filters( 'bbp_get_reply_author_role', $author_role, $r );

trunk/src/includes/topics/template.php

@@ -1716 +1716 @@
         $r = bbp_parse_args( $args, array(
             'topic_id' => 0,
-            'class'    => 'bbp-author-role',
-            'before'   => '',
-            'after'    => ''
+            'class'    => false,
+            'before'   => '<div class="bbp-author-role">',
+            'after'    => '</div>'
         ), 'get_topic_author_role' );
 
         $topic_id    = bbp_get_topic_id( $r['topic_id'] );
         $role        = bbp_get_user_display_role( bbp_get_topic_author_id( $topic_id ) );
-        $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], $r['class'], $role, $r['after'] );
+
+        // Backwards compatibilty with old 'class' argument
+        if ( ! empty( $r['class'] ) ) {
+            $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], $r['class'], $role, $r['after'] );
+
+        // Simpler before & after arguments
+        // https://bbpress.trac.wordpress.org/ticket/2557
+        } else {
+            $author_role = $r['before'] . $role . $r['after'];
+        }
 
         return apply_filters( 'bbp_get_topic_author_role', $author_role, $r );