🔞 ADULT: Changeset/ - Full Gallery 2025

Changeset 713712


Ignore:
Timestamp:
05/16/2013 02:53:48 AM (13 years ago)
Author:
Messenlehner
Message:
  • Fix: Fixed bug that prevented unlocking achievements attached to unlocked steps.
  • Fix: Check if group component is turned on before querying groups.
Location:
badgeos-community-add-on/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • badgeos-community-add-on/trunk/badgeos-community.php

    r710053 r713712  
    66 * Tags: buddypress
    77 * Author: Credly
    8  * Version: 1.0.1
     8 * Version: 1.0.2
    99 * Author URI: https://credly.com/
    1010 * License: GNU AGPL
  • badgeos-community-add-on/trunk/includes/bp-activity.php

    r707200 r713712  
    1515 * @since 1.0.0
    1616 */
    17 function badgeos_award_achievement_bp_activity( $user_id, $achievement_id ){
     17function badgeos_award_achievement_bp_activity( $user_id, $achievement_id ) {
    1818
    19     if( !$user_id || !$achievement_id )
     19    if ( ! $user_id || ! $achievement_id )
    2020        return false;
    2121
    22     $post = get_post($achievement_id);
     22    $post = get_post( $achievement_id );
    2323    $type = $post->post_type;
    2424
    2525    // Don't make activity posts for step post type
    26     if( 'step' == $type )
     26    if ( 'step' == $type )
    2727        return false;
    2828
     
    3030    $achievement_type = get_page_by_title( $type, 'OBJECT', 'achievement-type' );
    3131    $can_bp_activity = get_post_meta( $achievement_type->ID, '_badgeos_create_bp_activty', true );
    32     if( $can_bp_activity )
     32    if ( ! $can_bp_activity )
    3333        return false;
    3434
     
    4444    // Insert the activity
    4545    bp_activity_add( array(
    46         'action'       => sprintf( __( '%1$s earned a %2$s: %3$s', 'badgeos-community' ), bp_core_get_userlink( $user_id ), $post_type_singular_name, '<a href="' . get_permalink( $achievement_id ) . '">' . $post->post_title . '</a>' ),
    47         'content'      => $content,
    48         'component'    => 'badgeos',
    49         'type'         => 'activity_update',
    50         'primary_link' => get_permalink( $achievement_id ),
    51         'user_id'      => $user_id
    52     ) );
     46            'action'       => sprintf( __( '%1$s earned a %2$s: %3$s', 'badgeos-community' ), bp_core_get_userlink( $user_id ), $post_type_singular_name, '<a href="' . get_permalink( $achievement_id ) . '">' . $post->post_title . '</a>' ),
     47            'content'      => $content,
     48            'component'    => 'badgeos',
     49            'type'         => 'activity_update',
     50            'primary_link' => get_permalink( $achievement_id ),
     51            'user_id'      => $user_id
     52        ) );
    5353
    5454}
  • badgeos-community-add-on/trunk/includes/bp-members.php

    r710053 r713712  
    2929
    3030    $achievement_types = badgeos_get_user_earned_achievement_types( bp_displayed_user_id() );
     31    // Eliminate step cpt from array
     32    if ( ( $key = array_search( 'step', $achievement_types ) ) !== false ) {
     33        unset( $achievement_types[$key] );
     34        $achievement_types = array_values( $achievement_types );
     35    }
    3136    if ( is_array( $achievement_types ) ) {
    32         foreach( $achievement_types as $achievement_type){
     37        foreach ( $achievement_types as $achievement_type ) {
    3338            $name = get_post_type_object( $achievement_type )->labels->name;
    34             $slug = str_replace(' ', '-', strtolower( $name ) );
     39            $slug = str_replace( ' ', '-', strtolower( $name ) );
    3540            if ( $slug && strpos( $_SERVER[REQUEST_URI], $slug ) ) {
    3641                $type = $achievement_type;
    3742            }
    3843        }
    39         if( !$type ) {
     44        if ( ! $type )
    4045            $type = $achievement_types[0];
    41         }
    4246    }
    4347
     
    5054        'user_id'     => bp_displayed_user_id(),
    5155    );
    52     echo badgeos_achievements_list_shortcode($atts);
     56    echo badgeos_achievements_list_shortcode( $atts );
    5357}
    5458
     
    7478 * @since 1.0.0
    7579 */
    76 function badgeos_bp_core_general_settings_before_submit(){
     80function badgeos_bp_core_general_settings_before_submit() {
    7781    $credly_user_enable = get_user_meta( bp_displayed_user_id(), 'credly_user_enable', true );?>
    7882    <label for="credly"><?php _e( 'Badge Sharing', 'badgeos-community' ); ?></label>
    7983    <input type="checkbox" value="true" <?php checked( $credly_user_enable, 'true' ); ?> name="credly_user_enable">
    80     <?php echo _e('Send eligible earned badges to Credly','badgeos-community');
    81 }
    82 add_action('bp_core_general_settings_before_submit','badgeos_bp_core_general_settings_before_submit');
     84    <?php echo _e( 'Send eligible earned badges to Credly', 'badgeos-community' );
     85}
     86add_action( 'bp_core_general_settings_before_submit', 'badgeos_bp_core_general_settings_before_submit' );
    8387