Merge branch 'dev'

# Conflicts: # src/languages/buddyboss.pot
buddyboss · Feb 15, 2020 · 0ac8ddf · 0ac8ddf
2 parents 415a8c3 + b3590c9
commit 0ac8ddf
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/bp-loader.php b/bp-loader.php
@@ -5,7 +5,7 @@
  * Description: The BuddyBoss Platform adds community features to WordPress. Member Profiles, Activity Feeds, Direct Messaging, Notifications, and more!
  * Author:      BuddyBoss
  * Author URI:  https://buddyboss.com/
- * Version:     1.2.6
+ * Version:     1.2.7
  * Text Domain: buddyboss
  * Domain Path: /bp-languages/
  * License:     GPLv2 or later (license.txt)

diff --git a/src/bp-activity/bp-activity-notifications.php b/src/bp-activity/bp-activity-notifications.php
@@ -248,7 +248,7 @@ function bp_activity_remove_screen_notifications( $user_id = 0 ) {
 		return;
 	}
 
-	bp_notifications_mark_notifications_by_item_id( $user_id, buddypress()->activity->id, 'new_at_mention' );
+	bp_notifications_mark_notifications_by_type( $user_id, buddypress()->activity->id, 'new_at_mention' );
 }
 add_action( 'bp_activity_clear_new_mentions', 'bp_activity_remove_screen_notifications', 10, 1 );
 

diff --git a/src/bp-core/js/register.js b/src/bp-core/js/register.js
@@ -204,12 +204,12 @@ jQuery( document ).ready( function() {
 	});
 
 	//for form validation
-	jQuery( document ).on( 'click', 'body #buddypress #register-page #signup-form #signup_submit' , function() {
+	jQuery( document ).on( 'click', 'body #buddypress #register-page #signup-form #signup_submit', function() {
 		//e.preventDefault();
 		var html_error = '<div class="bp-messages bp-feedback error">';
-				html_error += '<span class="bp-icon" aria-hidden="true"></span>';
-				html_error += '<p>' + BP_Register.required_field + '</p>';
-				html_error += '</div>';
+			html_error += '<span class="bp-icon" aria-hidden="true"></span>';
+			html_error += '<p>' + BP_Register.required_field + '</p>';
+			html_error += '</div>';
 		var signup_email 			= jQuery( '#signup_email' ),
 			signup_email_confirm 	= jQuery( '#signup_email_confirm' ),
 			signup_password 		= jQuery( '#signup_password' ),
@@ -240,11 +240,11 @@ jQuery( document ).ready( function() {
 				return_val = false;
 			}
 			if ( jQuery( this ).find( 'textarea' ).length && jQuery( this ).find( 'textarea' ).val() == '' ) {
-					jQuery( this ).find( 'textarea' ).before( html_error );
+				jQuery( this ).find( 'textarea' ).before( html_error );
 				return_val = false;
 			}
 			if ( jQuery( this ).find( 'select' ).length && jQuery( this ).find( 'select' ).val() == '' ) {
-					jQuery( this ).find( 'legend' ).next().append( html_error );
+				jQuery( this ).find( 'select' ).before( html_error );
 				return_val = false;
 			}
 			if ( jQuery( this ).find( 'input[type="checkbox"]' ).length ) {
@@ -270,6 +270,7 @@ jQuery( document ).ready( function() {
 			    type: 'POST',
 			    url: ajaxurl,
 			    dataType: 'json',
+				async: false,
 			    data: jQuery( 'body #buddypress #register-page #signup-form' ).serialize() + '&action=check_email',
 			    success: function ( response ) {
 			    	if (response.signup_email) {
@@ -310,7 +311,7 @@ jQuery( document ).ready( function() {
 	var emailSelector, confirmEmailSelector, errorMessageSelector;
 	emailSelector 	  = jQuery( '#signup_email' );
 	if ( emailSelector.length ) {
-	emailSelector.on( 'focusout', bp_register_validate_email );
+		emailSelector.on( 'focusout', bp_register_validate_email );
     }
 
 	confirmEmailSelector =  jQuery( '#signup_email_confirm' );

diff --git a/src/bp-core/js/register.min.js b/src/bp-core/js/register.min.js
diff --git a/src/bp-loader.php b/src/bp-loader.php
@@ -5,7 +5,7 @@
  * Description: The BuddyBoss Platform adds community features to WordPress. Member Profiles, Activity Feeds, Direct Messaging, Notifications, and more!
  * Author:      BuddyBoss
  * Author URI:  https://buddyboss.com/
- * Version:     1.2.6
+ * Version:     1.2.7
  * Text Domain: buddyboss
  * Domain Path: /languages/
  * License:     GPLv2 or later (license.txt)
@@ -21,7 +21,7 @@
 
 
 if ( ! defined( 'BP_PLATFORM_VERSION' ) ) {
-	define( 'BP_PLATFORM_VERSION', '1.2.6' );
+	define( 'BP_PLATFORM_VERSION', '1.2.7' );
 }
 
 global $bp_incompatible_plugins;

diff --git a/src/languages/buddyboss.pot b/src/languages/buddyboss.pot
@@ -2,9 +2,9 @@
 # This file is distributed under the GPLv2 or later (license.txt).
 msgid ""
 msgstr ""
-"Project-Id-Version: BuddyBoss Platform 1.2.6\n"
+"Project-Id-Version: BuddyBoss Platform 1.2.7\n"
 "Report-Msgid-Bugs-To: https://www.buddyboss.com/contact/\n"
-"POT-Creation-Date: 2020-02-11 04:31:24+00:00\n"
+"POT-Creation-Date: 2020-02-15 00:25:36+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/src/readme.txt b/src/readme.txt
@@ -3,7 +3,7 @@ Contributors: buddyboss
 Requires at least: 4.9.1
 Tested up to: 5.3.2
 Requires PHP: 5.6.20
-Stable tag: 1.2.6
+Stable tag: 1.2.7
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -55,6 +55,10 @@ Furthermore, BuddyBoss Platform can be activated and operate in just about any s
 
 == Changelog ==
 
+= 1.2.7 =
+* Activity - Fixed error on Mentions tab, when 'Activity tabs' option is enabled
+* Registration - Fixed false validation on registration page, when using required fields
+
 = 1.2.6 =
 * Widgets - Added option to hide '(BB) Profile Completion' widget when progress hits 100%
 * Activity - Fixed issue with deleted users leaving 'Unknown' likes in activity
-Original file line number
+Diff line change
@@ Expand Up @@
     		return;
     	}
-    	bp_notifications_mark_notifications_by_item_id( $user_id, buddypress()->activity->id, 'new_at_mention' );
+    	bp_notifications_mark_notifications_by_type( $user_id, buddypress()->activity->id, 'new_at_mention' );
     }
     add_action( 'bp_activity_clear_new_mentions', 'bp_activity_remove_screen_notifications', 10, 1 );
@@ Expand Down @@