Skip to:
Content

bbPress.org

Changeset 6027


Ignore:
Timestamp:
05/19/2016 07:42:24 PM (5 years ago)
Author:
johnjamesjacoby
Message:

Statuses, Types, Visibilities: bbp_get_topic_types() usages were missed in r6026.

See #2954.

Location:
trunk/src/includes/topics
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/topics/functions.php

    r6026 r6027  
    753753        /** Stickies **********************************************************/
    754754
    755         if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array_keys( bbp_get_topic_types() ) ) ) {
     755        // Get the topic types
     756        $topic_types = bbp_get_topic_types( $topic_id );
     757
     758        // Maybe sticky
     759        if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array_keys( $topic_types ) ) ) {
    756760
    757761            // What's the caps?
  • trunk/src/includes/topics/template.php

    r5951 r6027  
    33073307
    33083308                    // Get current topic id
    3309                     $topic_id = bbp_get_topic_id( $r['topic_id'] );
     3309                    $r['topic_id'] = bbp_get_topic_id( $r['topic_id'] );
    33103310
    33113311                    // Topic is super sticky
    3312                     if ( bbp_is_topic_super_sticky( $topic_id ) ) {
     3312                    if ( bbp_is_topic_super_sticky( $r['topic_id'] ) ) {
    33133313                        $r['selected'] = 'super';
    33143314
    33153315                    // Topic is sticky or normal
    33163316                    } else {
    3317                         $r['selected'] = bbp_is_topic_sticky( $topic_id, false ) ? 'stick' : 'unstick';
     3317                        $r['selected'] = bbp_is_topic_sticky( $r['topic_id'], false )
     3318                            ? 'stick'
     3319                            : 'unstick';
    33183320                    }
    33193321                }
     
    33293331        <select name="<?php echo esc_attr( $r['select_id'] ); ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select" class="<?php echo esc_attr( $r['select_class'] ); ?>"<?php echo $tab; ?>>
    33303332
    3331             <?php foreach ( bbp_get_topic_types() as $key => $label ) : ?>
     3333            <?php foreach ( bbp_get_topic_types( $r['topic_id'] ) as $key => $label ) : ?>
    33323334
    33333335                <option value="<?php echo esc_attr( $key ); ?>"<?php selected( $key, $r['selected'] ); ?>><?php echo esc_html( $label ); ?></option>
Note: See TracChangeset for help on using the changeset viewer.