diff --git a/bp-compliments.php b/bp-compliments.php index 61cb8d0..339301a 100644 --- a/bp-compliments.php +++ b/bp-compliments.php @@ -2,24 +2,28 @@ /** * This is the main BuddyPress Compliments plugin file, here we declare and call the important stuff * - * @since 0.0.1 - * @package BuddyPress_Compliments + * @package BuddyPress_Compliments + * @copyright 2016 AyeCode Ltd + * @license GPL-2.0+ + * + * @wordpress-plugin + * Plugin Name: BuddyPress Compliments + * Plugin URI: http://wpgeodirectory.com/ + * Description: Compliments module for BuddyPress. + * Version: 1.0.5 + * Author: GeoDirectory + * Author URI: http://wpgeodirectory.com + * Text Domain: bp-compliments + * Domain Path: /languages + * Requires at least: 3.1 + * Tested up to: 4.4 */ -/* -Plugin Name: BuddyPress Compliments -Plugin URI: http://wpgeodirectory.com/ -Description: Compliments module for BuddyPress. -Version: 1.0.4 -Author: GeoDirectory -Author URI: http://wpgeodirectory.com -*/ - // Exit if accessed directly if ( !defined( 'ABSPATH' ) ) exit; // Define the plugin version. -define( 'BP_COMPLIMENTS_VER', '1.0.4' ); +define( 'BP_COMPLIMENTS_VER', '1.0.5' ); /** * BuddyPress compliments text domain. diff --git a/change_log.txt b/change_log.txt index a833e94..64d7829 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,3 +1,7 @@ +v1.0.5 +Email notifications not working - FIXED +Compliment line break and clickable support removed. Use filter to override - CHANGED + v1.0.4 Compliment user settings page - ADDED Linebreaks are removed on compliment messages - FIXED diff --git a/includes/bp-compliments-notifications.php b/includes/bp-compliments-notifications.php index c0493a1..1629663 100644 --- a/includes/bp-compliments-notifications.php +++ b/includes/bp-compliments-notifications.php @@ -46,7 +46,7 @@ function bp_compliments_format_notifications( $action, $item_id, $secondary_item $text = false; if ( 1 == $total_items ) { - $text = sprintf( __( '%s has sent you a %s', 'bp-compliments' ), bp_core_get_user_displayname( $item_id ), strtolower(BP_COMP_SINGULAR_NAME) ); + $text = sprintf( __( '%s has sent you a %s', 'bp-compliments' ), bp_core_get_user_displayname( $item_id ), BP_COMP_SINGULAR_NAME ); $link = bp_core_get_user_domain( $bp->loggedin_user->id ) .BP_COMPLIMENTS_SLUG. '/?bpc_read=true&bpc_sender_id='.$item_id; } break; @@ -151,10 +151,11 @@ function bp_compliments_notifications_add_on_compliment( BP_Compliments $complim * @since 0.0.2 * @package BuddyPress_Compliments * + * @param array $args Sender and Receiver user ID. * @return bool */ -function bp_compliments_new_compliment_email_notification() { - $args = ''; +function bp_compliments_new_compliment_email_notification($args = array()) { +// $args = ''; $defaults = array( 'receiver_id' => bp_displayed_user_id(), @@ -166,17 +167,6 @@ function bp_compliments_new_compliment_email_notification() { if ( 'no' == bp_get_user_meta( (int) $r['receiver_id'], 'notification_on_compliments', true ) ) return false; - // Check to see if this receiver has already been notified of this sender before - $has_notified = bp_get_user_meta( $r['sender_id'], 'bp_compliments_has_notified', true ); - - // Already notified so don't send another email - if ( in_array( $r['receiver_id'], (array) $has_notified ) ) - return false; - - // Not been notified before, update usermeta and continue to mail - $has_notified[] = $r['receiver_id']; - bp_update_user_meta( $r['sender_id'], 'bp_compliments_has_notified', $has_notified ); - $sender_name = bp_core_get_user_displayname( $r['sender_id'] ); $compliment_link = bp_core_get_user_domain( $r['receiver_id'] ) .BP_COMPLIMENTS_SLUG. '/?bpc_read=true&bpc_sender_id='.$r['sender_id']; diff --git a/includes/bp-compliments-settings.php b/includes/bp-compliments-settings.php index c969e45..8fa066a 100644 --- a/includes/bp-compliments-settings.php +++ b/includes/bp-compliments-settings.php @@ -72,7 +72,7 @@ function bp_compliments_settings_page() { - + @@ -92,7 +92,7 @@ function bp_compliments_settings_page() { - + diff --git a/includes/templates/buddypress/members/single/compliments.php b/includes/templates/buddypress/members/single/compliments.php index 7501664..0b4c740 100644 --- a/includes/templates/buddypress/members/single/compliments.php +++ b/includes/templates/buddypress/members/single/compliments.php @@ -118,7 +118,8 @@ class='preview-upload'/> message)); ?> + $comp_message = apply_filters('bp_comp_message', $comp->message); + echo $comp_message; ?> diff --git a/languages/bp-compliments-en_US.mo b/languages/bp-compliments-en_US.mo index f9e6795..22db885 100644 Binary files a/languages/bp-compliments-en_US.mo and b/languages/bp-compliments-en_US.mo differ diff --git a/languages/bp-compliments-en_US.po b/languages/bp-compliments-en_US.po index 4719c89..29c78bb 100644 --- a/languages/bp-compliments-en_US.po +++ b/languages/bp-compliments-en_US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: BuddyPress Compliments 1.0.3\n" -"POT-Creation-Date: 2016-02-25 14:58-0000\n" -"PO-Revision-Date: 2016-02-25 14:58-0000\n" +"Project-Id-Version: BuddyPress Compliments 1.0.5\n" +"POT-Creation-Date: 2016-03-11 11:11-0000\n" +"PO-Revision-Date: 2016-03-11 11:11-0000\n" "Last-Translator: \n" "Language-Team: GeoDirectory \n" "Language: en_US\n" @@ -99,12 +99,12 @@ msgid "No compliments found." msgstr "" #: includes/bp-compliments-notifications.php:49 -#: includes/bp-compliments-notifications.php:188 +#: includes/bp-compliments-notifications.php:178 #, php-format msgid "%s has sent you a %s" msgstr "" -#: includes/bp-compliments-notifications.php:191 +#: includes/bp-compliments-notifications.php:181 #, php-format msgid "" "%s has sent you a %s.\n" @@ -112,7 +112,7 @@ msgid "" "To view %s's %s: %s" msgstr "" -#: includes/bp-compliments-notifications.php:198 +#: includes/bp-compliments-notifications.php:188 #, php-format msgid "" "\n" @@ -122,21 +122,21 @@ msgid "" "%s" msgstr "" -#: includes/bp-compliments-notifications.php:281 +#: includes/bp-compliments-notifications.php:271 #: includes/bp-compliments-settings.php:89 #: includes/bp-compliments-settings.php:98 #: includes/bp-compliments-settings.php:107 msgid "Yes" msgstr "" -#: includes/bp-compliments-notifications.php:282 +#: includes/bp-compliments-notifications.php:272 #: includes/bp-compliments-settings.php:90 #: includes/bp-compliments-settings.php:99 #: includes/bp-compliments-settings.php:108 msgid "No" msgstr "" -#: includes/bp-compliments-notifications.php:289 +#: includes/bp-compliments-notifications.php:279 #, php-format msgid "A member sends you a %s" msgstr "" @@ -316,27 +316,27 @@ msgstr "" msgid "Delete" msgstr "" -#: includes/templates/buddypress/members/single/compliments.php:133 +#: includes/templates/buddypress/members/single/compliments.php:134 #, php-format msgid "1 of 1" msgid_plural "%1$s to %2$s of %3$s" msgstr[0] "" msgstr[1] "" -#: includes/templates/buddypress/members/single/compliments.php:136 +#: includes/templates/buddypress/members/single/compliments.php:137 msgid "Go to Page" msgstr "" -#: includes/templates/buddypress/members/single/compliments.php:152 +#: includes/templates/buddypress/members/single/compliments.php:153 msgid "You don't have permission to access this page." msgstr "" -#: includes/templates/buddypress/members/single/compliments.php:159 +#: includes/templates/buddypress/members/single/compliments.php:160 #, php-format msgid "Aw, you have no %1$s yet. To get some try sending %1$s to others." msgstr "" -#: includes/templates/buddypress/members/single/compliments.php:165 +#: includes/templates/buddypress/members/single/compliments.php:166 #, php-format msgid "Sorry, no %1$s just yet." msgstr "" diff --git a/readme.txt b/readme.txt index e885679..3a2b3cf 100644 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === BuddyPress Compliments === Contributors: viruthagiri, stiofansisland, paoltaia Donate link: http://wpgeodirectory.com/ -Tags: buddypress, buddypress compliments, wordpress yelp compliments, buddypress integration, business directory plugin, directory, directory plugin, geodirectory, geodirectory buddypress, geodirectory buddypress integration, social network, yelp clone, yelp compliments +Tags: buddypress, buddypress compliments, WordPress yelp compliments, buddypress integration, business directory plugin, directory, directory plugin, geodirectory, geodirectory buddypress, geodirectory buddypress integration, social network, yelp clone, yelp compliments Requires at least: 3.1 -Tested up to: 4.3 -Stable tag: 1.0.4 +Tested up to: 4.4 +Stable tag: 1.0.5 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -20,7 +20,7 @@ BuddyPress compliments adds a smart way for BuddyPress members to interact with * When you click the Compliments button, a popup will show up with compliment types * Submitted compliments will be visible in user's compliments section. * Compliments can be set as private and visible only to the member receiving them. -* A notification is optioonally sent to the compliment receiving member. +* A notification is optionally sent to the compliment receiving member. * Compliments can optionally be tracked in BuddyPress Activity * Members can delete compliments received (option to prevent this available). * Compliments are now paginated @@ -72,6 +72,10 @@ No questions so far, but don't hesitate to ask! == Changelog == += 1.0.5 = +Email notifications not working - FIXED +Compliment line break and clickable support removed. Use filter to override - CHANGED + = 1.0.4 = Compliment user settings page - ADDED Linebreaks are removed on compliment messages - FIXED