Skip to:
Content

bbPress.org

Changeset 5513


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/replies/template.php

    r5507 r5513  
    14341434        $r = bbp_parse_args( $args, array(
    14351435            'reply_id' => 0,
    1436             'class'    => 'bbp-author-role',
    1437             'before'   => '',
    1438             'after'    => ''
     1436            'class'    => false,
     1437            'before'   => '<div class="bbp-author-role">',
     1438            'after'    => '</div>'
    14391439        ), 'get_reply_author_role' );
    14401440
    14411441        $reply_id    = bbp_get_reply_id( $r['reply_id'] );
    14421442        $role        = bbp_get_user_display_role( bbp_get_reply_author_id( $reply_id ) );
    1443         $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'] );
     1443
     1444        // Backwards compatibilty with old 'class' argument
     1445        if ( ! empty( $r['class'] ) ) {
     1446            $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'] );
     1447
     1448        // Simpler before & after arguments
     1449        // https://bbpress.trac.wordpress.org/ticket/2557
     1450        } else {
     1451            $author_role = $r['before'] . $role . $r['after'];
     1452        }
    14441453
    14451454        return apply_filters( 'bbp_get_reply_author_role', $author_role, $r );
  • trunk/src/includes/topics/template.php

    r5504 r5513  
    17161716        $r = bbp_parse_args( $args, array(
    17171717            'topic_id' => 0,
    1718             'class'    => 'bbp-author-role',
    1719             'before'   => '',
    1720             'after'    => ''
     1718            'class'    => false,
     1719            'before'   => '<div class="bbp-author-role">',
     1720            'after'    => '</div>'
    17211721        ), 'get_topic_author_role' );
    17221722
    17231723        $topic_id    = bbp_get_topic_id( $r['topic_id'] );
    17241724        $role        = bbp_get_user_display_role( bbp_get_topic_author_id( $topic_id ) );
    1725         $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], $r['class'], $role, $r['after'] );
     1725
     1726        // Backwards compatibilty with old 'class' argument
     1727        if ( ! empty( $r['class'] ) ) {
     1728            $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], $r['class'], $role, $r['after'] );
     1729
     1730        // Simpler before & after arguments
     1731        // https://bbpress.trac.wordpress.org/ticket/2557
     1732        } else {
     1733            $author_role = $r['before'] . $role . $r['after'];
     1734        }
    17261735
    17271736        return apply_filters( 'bbp_get_topic_author_role', $author_role, $r );
Note: See TracChangeset for help on using the changeset viewer.