Skip to:
Content

bbPress.org

Changeset 4118


Ignore:
Timestamp:
07/24/2012 04:09:49 AM (9 years ago)
Author:
johnjamesjacoby
Message:

Forum Actions:

  • Remove bbp_has_topics() from forum trash and topic delete functions.
  • Use WP_Query's instead.
  • Remove phpdoc references to bbp_has_topics() where it's no longer used.
  • Fixes #1914.
  • For 2.1 branch.
Location:
branches/2.1/bbp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/bbp-includes/bbp-core-shortcodes.php

    r4059 r4118  
    244244     * @param array $attr
    245245     * @param string $content
    246      * @uses bbp_has_topics()
    247      * @uses get_template_part()
    248      * @uses bbp_single_forum_description()
    249246     * @return string
    250247     */
     
    309306     * @param string $content
    310307     * @uses bbp_get_hidden_forum_ids()
    311      * @uses bbp_has_topics()
    312308     * @uses get_template_part()
    313309     * @return string
     
    599595     * @param array $attr
    600596     * @param string $content
    601      * @uses bbp_has_topics()
    602597     * @uses get_template_part()
    603598     * @uses bbp_single_forum_description()
  • branches/2.1/bbp-includes/bbp-forum-functions.php

    r4104 r4118  
    19521952 * @uses bbp_is_forum() To make sure it's a forum
    19531953 * @uses bbp_get_topic_post_type() To get the topic post type
    1954  * @uses bbp_has_topics() To get the topics
    19551954 * @uses bbp_topics() To make sure there are topics to loop through
    19561955 * @uses wp_trash_post() To trash the post
     
    19661965
    19671966    // Forum is being permanently deleted, so its topics gotta go too
    1968     if ( bbp_has_topics( array(
    1969         'post_type'      => bbp_get_topic_post_type(),
    1970         'post_parent'    => $forum_id,
    1971         'post_status'    => 'any',
    1972         'posts_per_page' => -1
     1967    if ( $topics = new WP_Query( array(
     1968        'suppress_filters' => true,
     1969        'post_type'        => bbp_get_topic_post_type(),
     1970        'post_parent'      => $forum_id,
     1971        'post_status'      => 'any',
     1972        'posts_per_page'   => -1,
     1973        'nopaging'         => true,
     1974        'fields'           => 'id=>parent'
    19731975    ) ) ) {
    1974         while ( bbp_topics() ) {
    1975             bbp_the_topic();
    1976             wp_delete_post( bbpress()->topic_query->post->ID, true );
     1976        foreach ( $topics->posts as $topic ) {
     1977            wp_delete_post( $topic->ID, true );
    19771978        }
    19781979    }
     
    19911992 * @uses bbp_get_pending_status_id() To return pending post status
    19921993 * @uses bbp_get_topic_post_type() To get the topic post type
    1993  * @uses bbp_has_topics() To get the topics
    1994  * @uses bbp_topics() To make sure there are topics to loop through
    19951994 * @uses wp_trash_post() To trash the post
    19961995 * @uses update_post_meta() To update the forum meta of trashed topics
     
    20122011
    20132012    // Forum is being trashed, so its topics are trashed too
    2014     if ( bbp_has_topics( array(
    2015         'post_type'      => bbp_get_topic_post_type(),
    2016         'post_parent'    => $forum_id,
    2017         'post_status'    => $post_stati,
    2018         'posts_per_page' => -1
     2013    if ( $topics = new WP_Query( array(
     2014        'suppress_filters' => true,
     2015        'post_type'        => bbp_get_topic_post_type(),
     2016        'post_parent'      => $forum_id,
     2017        'post_status'      => $post_stati,
     2018        'posts_per_page'   => -1,
     2019        'nopaging'         => true,
     2020        'fields'           => 'id=>parent'
    20192021    ) ) ) {
    20202022
    20212023        // Prevent debug notices
    20222024        $pre_trashed_topics = array();
    2023         $bbp                = bbpress();
    20242025
    20252026        // Loop through topics, trash them, and add them to array
    2026         while ( bbp_topics() ) {
    2027             bbp_the_topic();
    2028             wp_trash_post( $bbp->topic_query->post->ID );
    2029             $pre_trashed_topics[] = $bbp->topic_query->post->ID;
     2027        foreach ( $topics->posts as $topic ) {
     2028            wp_trash_post( $topic->ID, true );
     2029            $pre_trashed_topics[] = $topic->ID;
    20302030        }
    20312031
     
    20872087 * @uses bbp_is_forum() To check if the passed id is a forum
    20882088 * @uses do_action() Calls 'bbp_delete_forum' with the forum id
    2089  * @uses bbp_has_topics() To check if the forum has topics
    2090  * @uses bbp_topics() To loop through the topics
    2091  * @uses bbp_the_topic() To set a topic as the current topic in the loop
    2092  * @uses bbp_get_topic_id() To get the topic id
    2093  * @uses wp_delete_post() To delete the topic
    20942089 */
    20952090function bbp_delete_forum( $forum_id = 0 ) {
     
    21132108 * @uses bbp_is_forum() To check if the passed id is a forum
    21142109 * @uses do_action() Calls 'bbp_trash_forum' with the forum id
    2115  * @uses bbp_has_topics() To check if the forum has topics
    2116  * @uses bbp_topics() To loop through the topics
    2117  * @uses bbp_the_topic() To set a topic as the current topic in the loop
    2118  * @uses bbp_get_topic_id() To get the topic id
    2119  * @uses wp_trash_post() To trash the topic
    2120  * @uses update_post_meta() To save a list of just trashed topics for future use
    21212110 */
    21222111function bbp_trash_forum( $forum_id = 0 ) {
     
    21362125 * @uses bbp_is_forum() To check if the passed id is a forum
    21372126 * @uses do_action() Calls 'bbp_untrash_forum' with the forum id
    2138  * @uses get_post_meta() To get the list of topics which were trashed with the
    2139  *                        forum
    2140  * @uses wp_untrash_post() To untrash the topic
    21412127 */
    21422128function bbp_untrash_forum( $forum_id = 0 ) {
Note: See TracChangeset for help on using the changeset viewer.