Changeset 713712
- Timestamp:
- 05/16/2013 02:53:48 AM (13 years ago)
- Location:
- badgeos-community-add-on/trunk
- Files:
-
- 6 edited
-
badgeos-community.php (modified) (1 diff)
-
includes/bp-activity.php (modified) (3 diffs)
-
includes/bp-members.php (modified) (8 diffs)
-
includes/rules-engine.php (modified) (2 diffs)
-
includes/steps-ui.php (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
badgeos-community-add-on/trunk/badgeos-community.php
r710053 r713712 6 6 * Tags: buddypress 7 7 * Author: Credly 8 * Version: 1.0. 18 * Version: 1.0.2 9 9 * Author URI: https://credly.com/ 10 10 * License: GNU AGPL -
badgeos-community-add-on/trunk/includes/bp-activity.php
r707200 r713712 15 15 * @since 1.0.0 16 16 */ 17 function badgeos_award_achievement_bp_activity( $user_id, $achievement_id ) {17 function badgeos_award_achievement_bp_activity( $user_id, $achievement_id ) { 18 18 19 if ( !$user_id || !$achievement_id )19 if ( ! $user_id || ! $achievement_id ) 20 20 return false; 21 21 22 $post = get_post( $achievement_id);22 $post = get_post( $achievement_id ); 23 23 $type = $post->post_type; 24 24 25 25 // Don't make activity posts for step post type 26 if ( 'step' == $type )26 if ( 'step' == $type ) 27 27 return false; 28 28 … … 30 30 $achievement_type = get_page_by_title( $type, 'OBJECT', 'achievement-type' ); 31 31 $can_bp_activity = get_post_meta( $achievement_type->ID, '_badgeos_create_bp_activty', true ); 32 if ($can_bp_activity )32 if ( ! $can_bp_activity ) 33 33 return false; 34 34 … … 44 44 // Insert the activity 45 45 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_id52 ) );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 ) ); 53 53 54 54 } -
badgeos-community-add-on/trunk/includes/bp-members.php
r710053 r713712 29 29 30 30 $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 } 31 36 if ( is_array( $achievement_types ) ) { 32 foreach ( $achievement_types as $achievement_type){37 foreach ( $achievement_types as $achievement_type ) { 33 38 $name = get_post_type_object( $achievement_type )->labels->name; 34 $slug = str_replace( ' ', '-', strtolower( $name ) );39 $slug = str_replace( ' ', '-', strtolower( $name ) ); 35 40 if ( $slug && strpos( $_SERVER[REQUEST_URI], $slug ) ) { 36 41 $type = $achievement_type; 37 42 } 38 43 } 39 if ( !$type ) {44 if ( ! $type ) 40 45 $type = $achievement_types[0]; 41 }42 46 } 43 47 … … 50 54 'user_id' => bp_displayed_user_id(), 51 55 ); 52 echo badgeos_achievements_list_shortcode( $atts);56 echo badgeos_achievements_list_shortcode( $atts ); 53 57 } 54 58 … … 74 78 * @since 1.0.0 75 79 */ 76 function badgeos_bp_core_general_settings_before_submit() {80 function badgeos_bp_core_general_settings_before_submit() { 77 81 $credly_user_enable = get_user_meta( bp_displayed_user_id(), 'credly_user_enable', true );?> 78 82 <label for="credly"><?php _e( 'Badge Sharing', 'badgeos-community' ); ?></label> 79 83 <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 } 86 add_action( 'bp_core_general_settings_before_submit', 'badgeos_bp_core_general_settings_before_submit' ); 83 87