Skip to:
Content

bbPress.org

Changeset 5738


Ignore:
Timestamp:
05/13/2015 12:35:20 AM (9 years ago)
Author:
johnjamesjacoby
Message:

Topics: Improve type-casting in topic functions.

Props thebrandonallen, netweb. See #2801.

File:
1 edited

Legend:

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

    r5732 r5738  
    20412041    $stickies = ( empty( $stickies ) || ! is_array( $stickies ) ) ? array() : $stickies;
    20422042
    2043     return apply_filters( 'bbp_get_stickies', $stickies, (int) $forum_id );
     2043    return apply_filters( 'bbp_get_stickies', $stickies, $forum_id );
    20442044}
    20452045
     
    24182418    }
    24192419
    2420     update_post_meta( $topic_id, '_bbp_forum_id', (int) $forum_id );
    2421 
    2422     return apply_filters( 'bbp_update_topic_forum_id', (int) $forum_id, $topic_id );
     2420    $forum_id = (int) $forum_id;
     2421
     2422    update_post_meta( $topic_id, '_bbp_forum_id', $forum_id );
     2423
     2424    return (int) apply_filters( 'bbp_update_topic_forum_id', $forum_id, $topic_id );
    24232425}
    24242426
     
    24372439    $topic_id = bbp_get_topic_id( $topic_id );
    24382440
    2439     update_post_meta( $topic_id, '_bbp_topic_id', (int) $topic_id );
    2440 
    2441     return apply_filters( 'bbp_update_topic_topic_id', (int) $topic_id );
     2441    update_post_meta( $topic_id, '_bbp_topic_id', $topic_id );
     2442
     2443    return apply_filters( 'bbp_update_topic_topic_id', $topic_id );
    24422444}
    24432445
     
    24732475    }
    24742476
    2475     update_post_meta( $topic_id, '_bbp_reply_count', (int) $reply_count );
    2476 
    2477     return apply_filters( 'bbp_update_topic_reply_count', (int) $reply_count, $topic_id );
     2477    $reply_count = (int) $reply_count;
     2478
     2479    update_post_meta( $topic_id, '_bbp_reply_count', $reply_count );
     2480
     2481    return (int) apply_filters( 'bbp_update_topic_reply_count', $reply_count, $topic_id );
    24782482}
    24792483
     
    25162520    }
    25172521
    2518     update_post_meta( $topic_id, '_bbp_reply_count_hidden', (int) $reply_count );
    2519 
    2520     return apply_filters( 'bbp_update_topic_reply_count_hidden', (int) $reply_count, $topic_id );
     2522    $reply_count = (int) $reply_count;
     2523
     2524    update_post_meta( $topic_id, '_bbp_reply_count_hidden', $reply_count );
     2525
     2526    return (int) apply_filters( 'bbp_update_topic_reply_count_hidden', $reply_count, $topic_id );
    25212527}
    25222528
     
    25572563    }
    25582564
     2565    $active_id = (int) $active_id;
     2566
    25592567    // Update only if published
    25602568    if ( bbp_get_public_status_id() === get_post_status( $active_id ) ) {
    2561         update_post_meta( $topic_id, '_bbp_last_active_id', (int) $active_id );
    2562     }
    2563 
    2564     return apply_filters( 'bbp_update_topic_last_active_id', (int) $active_id, $topic_id );
     2569        update_post_meta( $topic_id, '_bbp_last_active_id', $active_id );
     2570    }
     2571
     2572    return (int) apply_filters( 'bbp_update_topic_last_active_id', $active_id, $topic_id );
    25652573}
    25662574
     
    26382646    }
    26392647
     2648    $reply_id = (int) $reply_id;
     2649
    26402650    // Update if reply is published
    26412651    if ( bbp_is_reply_published( $reply_id ) ) {
    2642         update_post_meta( $topic_id, '_bbp_last_reply_id', (int) $reply_id );
    2643     }
    2644 
    2645     return apply_filters( 'bbp_update_topic_last_reply_id', (int) $reply_id, $topic_id );
     2652        update_post_meta( $topic_id, '_bbp_last_reply_id', $reply_id );
     2653    }
     2654
     2655    return (int) apply_filters( 'bbp_update_topic_last_reply_id', $reply_id, $topic_id );
    26462656}
    26472657
     
    26782688
    26792689    // Query the DB to get voices in this topic
    2680     $voices = $wpdb->get_col( $wpdb->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
    2681 
    2682     // If there's an error, make sure we have at least have 1 voice
    2683     $voices = ( empty( $voices ) || is_wp_error( $voices ) ) ? 1 : $voices[0];
     2690    $voices = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
    26842691
    26852692    // Update the voice count for this topic id
    2686     update_post_meta( $topic_id, '_bbp_voice_count', (int) $voices );
    2687 
    2688     return apply_filters( 'bbp_update_topic_voice_count', (int) $voices, $topic_id );
     2693    update_post_meta( $topic_id, '_bbp_voice_count', $voices );
     2694
     2695    return (int) apply_filters( 'bbp_update_topic_voice_count', $voices, $topic_id );
    26892696}
    26902697
     
    27222729    $anonymous_replies = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( ID ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' AND post_author = 0 ) OR ( ID = %d AND post_type = '%s' AND post_author = 0 );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
    27232730
    2724     update_post_meta( $topic_id, '_bbp_anonymous_reply_count', (int) $anonymous_replies );
    2725 
    2726     return apply_filters( 'bbp_update_topic_anonymous_reply_count', (int) $anonymous_replies, $topic_id );
     2731    update_post_meta( $topic_id, '_bbp_anonymous_reply_count', $anonymous_replies );
     2732
     2733    return (int) apply_filters( 'bbp_update_topic_anonymous_reply_count', $anonymous_replies, $topic_id );
    27272734}
    27282735
Note: See TracChangeset for help on using the changeset viewer.