Skip to:
Content

bbPress.org

Changeset 5237


Ignore:
Timestamp:
12/30/2013 07:52:12 PM (8 years ago)
Author:
johnjamesjacoby
Message:

Use more explicit subscriptions functions for form output. Fixes #2493. (2.5 branch)

Location:
branches/2.5/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/includes/forums/template.php

    r5211 r5237  
    22462246     * @uses bbp_get_global_post_field() To get current post author
    22472247     * @uses bbp_get_current_user_id() To get the current user id
    2248      * @uses bbp_is_user_subscribed() To check if the user is subscribed to
    2249      *                the forum
     2248     * @uses bbp_is_user_subscribed_to_forum() To check if the user is
     2249     *                                          subscribed to the forum
    22502250     * @uses apply_filters() Calls 'bbp_get_form_forum_subscribed' with the
    22512251     *                option
     
    22662266            // Post author is not the current user
    22672267            if ( bbp_get_current_user_id() !== $post_author ) {
    2268                 $forum_subscribed = bbp_is_user_subscribed( $post_author );
     2268                $forum_subscribed = bbp_is_user_subscribed_to_forum( $post_author );
    22692269
    22702270            // Post author is the current user
    22712271            } else {
    2272                 $forum_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id() );
     2272                $forum_subscribed = bbp_is_user_subscribed_to_forum( bbp_get_current_user_id() );
    22732273            }
    22742274
    22752275        // Get current status
    22762276        } elseif ( bbp_is_single_forum() ) {
    2277             $forum_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id() );
     2277            $forum_subscribed = bbp_is_user_subscribed_to_forum( bbp_get_current_user_id() );
    22782278
    22792279        // No data
  • branches/2.5/includes/topics/template.php

    r5180 r5237  
    38993899     *
    39003900     * @uses bbp_is_topic_edit() To check if it's the topic edit page
    3901      * @uses bbp_is_user_subscribed() To check if the user is subscribed to
    3902      *                                 the topic
     3901     * @uses bbp_is_user_subscribed_to_topic() To check if the user is
     3902     *                                          subscribed to the topic
    39033903     * @uses apply_filters() Calls 'bbp_get_form_topic_subscribed' with the
    39043904     *                        option
     
    39193919            // Post author is not the current user
    39203920            if ( bbp_get_current_user_id() !== $post_author ) {
    3921                 $topic_subscribed = bbp_is_user_subscribed( $post_author );
     3921                $topic_subscribed = bbp_is_user_subscribed_to_topic( $post_author );
    39223922
    39233923            // Post author is the current user
    39243924            } else {
    3925                 $topic_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id() );
     3925                $topic_subscribed = bbp_is_user_subscribed_to_topic( bbp_get_current_user_id() );
    39263926            }
    39273927
    39283928        // Get current status
    39293929        } elseif ( bbp_is_single_topic() ) {
    3930             $topic_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id() );
     3930            $topic_subscribed = bbp_is_user_subscribed_to_topic( bbp_get_current_user_id() );
    39313931
    39323932        // No data
Note: See TracChangeset for help on using the changeset viewer.