Skip to:
Content

BuddyPress.org

Changeset 10487


Ignore:
Timestamp:
02/01/2016 06:53:30 PM (4 years ago)
Author:
djpaul
Message:

Fix indentation on lines beginning with a space character followed by a tab.

Location:
trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-activity/bp-activity-actions.php

    r10417 r10487  
    187187
    188188    // Check for the redirect query arg, otherwise let WP handle things.
    189     if ( !empty( $_GET['redirect_to'] ) )
     189    if ( !empty( $_GET['redirect_to'] ) )
    190190        bp_core_redirect( esc_url( $_GET['redirect_to'] ) );
    191191    else
     
    256256
    257257    // Check for the redirect query arg, otherwise let WP handle things.
    258     if ( !empty( $_GET['redirect_to'] ) )
     258    if ( !empty( $_GET['redirect_to'] ) )
    259259        bp_core_redirect( esc_url( $_GET['redirect_to'] ) );
    260260    else
  • trunk/src/bp-activity/bp-activity-admin.php

    r10464 r10487  
    309309    wp_enqueue_script( 'bp_activity_admin_js', $bp->plugin_url . "bp-activity/admin/js/admin.{$min}js",   array( 'jquery', 'wp-ajax-response' ), bp_get_version(), true );
    310310    wp_localize_script( 'bp_activity_admin_js', 'bp_activity_admin_vars', array(
    311         'page'  => get_current_screen()->id
    312     ) );
     311        'page' => get_current_screen()->id
     312    ) );
    313313    wp_enqueue_style( 'bp_activity_admin_css', $bp->plugin_url . "bp-activity/admin/css/admin.{$min}css", array(),                               bp_get_version()       );
    314314
  • trunk/src/bp-activity/bp-activity-notifications.php

    r10479 r10487  
    5656    $poster_name  = bp_core_get_user_displayname( $activity->user_id );
    5757
    58     remove_filter( 'bp_get_activity_content_body', 'convert_smilies' );
     58    remove_filter( 'bp_get_activity_content_body', 'convert_smilies' );
    5959    remove_filter( 'bp_get_activity_content_body', 'wpautop' );
    6060    remove_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
     
    6363    $content = apply_filters( 'bp_get_activity_content_body', $activity->content );
    6464
    65     add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
     65    add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
    6666    add_filter( 'bp_get_activity_content_body', 'wpautop' );
    6767    add_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
     
    124124    $thread_link       = bp_activity_get_permalink( $params['activity_id'] );
    125125
    126     remove_filter( 'bp_get_activity_content_body', 'convert_smilies' );
     126    remove_filter( 'bp_get_activity_content_body', 'convert_smilies' );
    127127    remove_filter( 'bp_get_activity_content_body', 'wpautop' );
    128128    remove_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
     
    131131    $content = apply_filters( 'bp_get_activity_content_body', $params['content'] );
    132132
    133     add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
     133    add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
    134134    add_filter( 'bp_get_activity_content_body', 'wpautop' );
    135135    add_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
  • trunk/src/bp-activity/bp-activity-template.php

    r10455 r10487  
    22212221         * @param bool $value Whether or not the current activity item is in the current user's favorites.
    22222222         */
    2223         return (bool) apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template->activity->id, (array) $activities_template->my_favs ) );
     2223        return (bool) apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template->activity->id, (array) $activities_template->my_favs ) );
    22242224    }
    22252225
     
    34083408         * @param string $value All of the links to be displayed to the user.
    34093409         */
    3410         return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
     3410        return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
    34113411    }
    34123412
  • trunk/src/bp-activity/classes/class-bp-activity-feed.php

    r10455 r10487  
    425425    <ttl><?php echo $this->ttl; ?></ttl>
    426426    <sy:updatePeriod><?php echo $this->update_period; ?></sy:updatePeriod>
    427     <sy:updateFrequency><?php echo $this->update_frequency; ?></sy:updateFrequency>
     427    <sy:updateFrequency><?php echo $this->update_frequency; ?></sy:updateFrequency>
    428428    <?php
    429429
  • trunk/src/bp-core/bp-core-avatars.php

    r10417 r10487  
    14461446
    14471447    /**
    1448      * Filters the list of allowed image types.
    1449      *
    1450      * @since 2.3.0
    1451      *
    1452      * @param array $allowed_types List of image types.
    1453      */
    1454     $avatar_types = (array) apply_filters( 'bp_core_get_allowed_avatar_types', $allowed_types );
    1455 
    1456     if ( empty( $avatar_types ) ) {
    1457         $avatar_types = $allowed_types;
    1458     } else {
    1459         $avatar_types = array_intersect( $allowed_types, $avatar_types );
    1460     }
    1461 
    1462     return array_values( $avatar_types );
     1448     * Filters the list of allowed image types.
     1449     *
     1450     * @since 2.3.0
     1451     *
     1452     * @param array $allowed_types List of image types.
     1453     */
     1454    $avatar_types = (array) apply_filters( 'bp_core_get_allowed_avatar_types', $allowed_types );
     1455
     1456    if ( empty( $avatar_types ) ) {
     1457        $avatar_types = $allowed_types;
     1458    } else {
     1459        $avatar_types = array_intersect( $allowed_types, $avatar_types );
     1460    }
     1461
     1462    return array_values( $avatar_types );
    14631463}
    14641464
  • trunk/src/bp-core/bp-core-buddybar.php

    r10417 r10487  
    205205    }
    206206
    207     /**
     207    /**
    208208     * If this nav item is hidden for the displayed user, and
    209209     * the logged in user is not the displayed user
     
    215215
    216216    /**
    217      * If the nav item is visible, we are not viewing a user, and this is a root
     217     * If the nav item is visible, we are not viewing a user, and this is a root
    218218     * component, don't attach the default subnav function so we can display a
    219219     * directory or something else.
    220      */
     220     */
    221221    if ( ( -1 != $r['position'] ) && bp_is_root_component( $r['slug'] ) && ! bp_displayed_user_id() ) {
    222222        return;
  • trunk/src/bp-core/bp-core-catchuri.php

    r10458 r10487  
    553553function bp_core_no_access( $args = '' ) {
    554554
    555     // Build the redirect URL.
    556     $redirect_url  = is_ssl() ? 'https://' : 'http://';
    557     $redirect_url .= $_SERVER['HTTP_HOST'];
    558     $redirect_url .= $_SERVER['REQUEST_URI'];
     555    // Build the redirect URL.
     556    $redirect_url  = is_ssl() ? 'https://' : 'http://';
     557    $redirect_url .= $_SERVER['HTTP_HOST'];
     558    $redirect_url .= $_SERVER['REQUEST_URI'];
    559559
    560560    $defaults = array(
  • trunk/src/bp-core/bp-core-functions.php

    r10484 r10487  
    756756function bp_core_component_slug_from_root_slug( $root_slug ) {
    757757    $slug_chunks = explode( '/', $root_slug );
    758     $slug        = array_pop( $slug_chunks );
     758    $slug        = array_pop( $slug_chunks );
    759759
    760760    /**
     
    766766     * @param string $root_slug The root slug which comes from $bp->pages-[component]->slug.
    767767     */
    768     return apply_filters( 'bp_core_component_slug_from_root_slug', $slug, $root_slug );
     768    return apply_filters( 'bp_core_component_slug_from_root_slug', $slug, $root_slug );
    769769}
    770770
     
    21722172            return true;
    21732173        }
    2174     }
     2174    }
    21752175
    21762176    // Default to WP and glotpress.
     
    29712971         * @param BP_Email $email The email we tried to send.
    29722972         */
    2973         do_action( 'bp_send_email_failure', $status, $email );
     2973        do_action( 'bp_send_email_failure', $status, $email );
    29742974
    29752975    } else {
  • trunk/src/bp-core/bp-core-template.php

    r10479 r10487  
    15661566     * @param string $component            Name of the component being checked.
    15671567     */
    1568     return apply_filters( 'bp_is_current_component', $is_current_component, $component );
     1568    return apply_filters( 'bp_is_current_component', $is_current_component, $component );
    15691569}
    15701570
  • trunk/src/bp-core/classes/class-bp-core-notification.php

    r10417 r10487  
    179179            : '';
    180180
    181         return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d {$is_new}", $user_id ) );
     181        return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d {$is_new}", $user_id ) );
    182182    }
    183183
  • trunk/src/bp-core/classes/class-bp-email.php

    r10483 r10487  
    737737            // Load the template.
    738738            bp_locate_template( bp_email_get_template( $this->post_object ), true, false );
    739             $this->set_template( ob_get_contents() );
     739            $this->set_template( ob_get_contents() );
    740740
    741741            ob_end_clean();
  • trunk/src/bp-core/css/admin-bar-rtl.css

    r9819 r10487  
    1818}
    1919#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
    20     right: 0;
     20    right: 0;
    2121}
    2222
  • trunk/src/bp-core/css/admin-bar.css

    r9819 r10487  
    1818}
    1919#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
    20     left: 0;
     20    left: 0;
    2121}
    2222
  • trunk/src/bp-core/deprecated/2.1.php

    r10446 r10487  
    459459                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $author->display_name )
    460460            ) );
    461             echo ' ' . $author->display_name . '</a>';
     461            echo ' ' . $author->display_name . '</a>';
    462462            echo '<div class="admin-bar-clear"></div>';
    463463            echo '</li>';
  • trunk/src/bp-core/deprecated/2.5.php

    r10479 r10487  
    2828     * @param string $value Value to set the "From" name to.
    2929     */
    30     return apply_filters( 'bp_core_email_from_name_filter', bp_get_option( 'blogname', 'WordPress' ) );
     30    return apply_filters( 'bp_core_email_from_name_filter', bp_get_option( 'blogname', 'WordPress' ) );
    3131}
    3232
  • trunk/src/bp-groups/bp-groups-actions.php

    r10454 r10487  
    107107        return false;
    108108
    109     if ( !bp_user_can_create_groups() ) {
     109    if ( !bp_user_can_create_groups() ) {
    110110        bp_core_add_message( __( 'Sorry, you are not allowed to create groups.', 'buddypress' ), 'error' );
    111111        bp_core_redirect( bp_get_groups_directory_permalink() );
  • trunk/src/bp-groups/classes/class-bp-groups-group.php

    r10454 r10487  
    280280        $this->creator_id   = apply_filters( 'groups_group_creator_id_before_save',   $this->creator_id,   $this->id );
    281281        $this->name         = apply_filters( 'groups_group_name_before_save',         $this->name,         $this->id );
    282         $this->slug         = apply_filters( 'groups_group_slug_before_save',         $this->slug,         $this->id );
     282        $this->slug         = apply_filters( 'groups_group_slug_before_save',         $this->slug,         $this->id );
    283283        $this->description  = apply_filters( 'groups_group_description_before_save',  $this->description,  $this->id );
    284         $this->status       = apply_filters( 'groups_group_status_before_save',       $this->status,       $this->id );
     284        $this->status       = apply_filters( 'groups_group_status_before_save',       $this->status,       $this->id );
    285285        $this->enable_forum = apply_filters( 'groups_group_enable_forum_before_save', $this->enable_forum, $this->id );
    286286        $this->date_created = apply_filters( 'groups_group_date_created_before_save', $this->date_created, $this->id );
  • trunk/src/bp-groups/classes/class-bp-groups-member.php

    r10454 r10487  
    852852        $bp = buddypress();
    853853
    854         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0", $user_id, $group_id ) );
     854        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0", $user_id, $group_id ) );
    855855    }
    856856
  • trunk/src/bp-members/bp-members-functions.php

    r10479 r10487  
    17391739     * @param array $result Results of user validation including errors, if any.
    17401740     */
    1741     return apply_filters( 'bp_core_validate_user_signup', $result );
     1741    return apply_filters( 'bp_core_validate_user_signup', $result );
    17421742}
    17431743
  • trunk/src/bp-members/bp-members-screens.php

    r10417 r10487  
    9494    $bp->signup->step = 'request-details';
    9595
    96     if ( !bp_get_signup_allowed() ) {
     96    if ( !bp_get_signup_allowed() ) {
    9797        $bp->signup->step = 'registration-disabled';
    9898
  • trunk/src/bp-templates/bp-legacy/buddypress-functions.php

    r10296 r10487  
    730730
    731731    $object_search_text = bp_get_search_default_text( $object );
    732     if ( ! empty( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
     732    if ( ! empty( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
    733733        $qs[] = 'search_terms=' . urlencode( $_POST['search_terms'] );
    734734
     
    794794        return;
    795795
    796     /**
     796    /**
    797797     * AJAX requests happen too early to be seen by bp_update_is_directory()
    798798     * so we do it manually here to ensure templates load with the correct
  • trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php

    r10265 r10487  
    106106
    107107        /**
    108          * Fires and displays the group content.
    109          *
    110          * @since 1.1.0
    111          */
     108         * Fires and displays the group content.
     109         *
     110         * @since 1.1.0
     111         */
    112112        do_action( 'bp_directory_groups_content' ); ?>
    113113
     
    117117
    118118        /**
    119          * Fires after the display of the groups content.
    120          *
    121          * @since 1.1.0
    122          */
     119         * Fires after the display of the groups content.
     120         *
     121         * @since 1.1.0
     122         */
    123123        do_action( 'bp_after_directory_groups_content' ); ?>
    124124
     
    128128
    129129    /**
    130      * Fires after the display of the groups.
    131      *
    132      * @since 1.1.0
    133      */
     130     * Fires after the display of the groups.
     131     *
     132     * @since 1.1.0
     133     */
    134134    do_action( 'bp_after_directory_groups' ); ?>
    135135
  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php

    r10181 r10487  
    142142        <label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
    143143
    144     </div>
     144    </div>
    145145
    146146    <hr />
  • trunk/src/bp-templates/bp-legacy/buddypress/members/index.php

    r10265 r10487  
    110110
    111111        /**
    112          * Fires and displays the members content.
    113          *
    114          * @since 1.1.0
    115          */
     112         * Fires and displays the members content.
     113         *
     114         * @since 1.1.0
     115         */
    116116        do_action( 'bp_directory_members_content' ); ?>
    117117
  • trunk/src/bp-templates/bp-legacy/css/twentyfifteen.scss

    r10451 r10487  
    15031503                    height: auto;
    15041504                    width: auto;
    1505             }
    1506         }
     1505            }
     1506        }
    15071507
    15081508            .main-column {
    15091509                margin-left: 0;
    1510         }
     1510        }
    15111511
    15121512            .submit {
     
    15141514                    display: inline-block;
    15151515                    width: 100%;
    1516             }
    1517         }
    1518     }
     1516            }
     1517        }
     1518    }
    15191519 }
    15201520
  • trunk/src/bp-xprofile/bp-xprofile-filters.php

    r10434 r10487  
    223223
    224224    // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731.
    225     if ( ! isset( $field_value ) || empty( $field_value ) && ( '0' !== $field_value ) ) {
     225    if ( ! isset( $field_value ) || empty( $field_value ) && ( '0' !== $field_value ) ) {
    226226        return false;
    227227    }
  • trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

    r10445 r10487  
    257257    /**
    258258     * @group groups_reject_membership_request
    259      * @group group_membership_requests
     259     * @group group_membership_requests
    260260     * @group group_membership
    261261     */
  • trunk/tests/phpunit/testcases/notifications/class-bp-notifications-template.php

    r9819 r10487  
    88class BP_Tests_Notifications_BPNotificationsTemplate extends BP_UnitTestCase {
    99    /**
    10      * @group pagination
    11      * @group BP6229
    12      */
    13     public function test_pagination_params_in_url_should_be_passed_to_query() {
     10     * @group pagination
     11     * @group BP6229
     12     */
     13    public function test_pagination_params_in_url_should_be_passed_to_query() {
    1414        $u = $this->factory->user->create();
    1515
     
    3838        $expected = array( $notifications[3], $notifications[2] );
    3939        $this->assertEquals( $expected, wp_list_pluck( $template->notifications, 'id' ) );
    40     }
     40    }
    4141}
Note: See TracChangeset for help on using the changeset viewer.