Merge branch 'dev'

pmpro-member-directory.php

@@ -3,14 +3,14 @@
 Plugin Name: Paid Memberships Pro - Member Directory Add On
 Plugin URI: https://www.paidmembershipspro.com/add-ons/member-directory/
 Description: Adds a customizable Member Directory and Member Profiles to your membership site.
-Version: 1.2
+Version: 1.2.1
 Author: Paid Memberships Pro
 Author URI: https://www.paidmembershipspro.com/
 Text Domain: pmpro-member-directory
 Domain Path: /languages
 */
 
-define( 'PMPRO_MEMBER_DIRECTORY_VERSION', '1.2' );
+define( 'PMPRO_MEMBER_DIRECTORY_VERSION', '1.2.1' );
 
 global $pmpromd_options;
 
@@ -269,7 +269,7 @@ function pmpromd_get_user_by_identifier( $value ) {
 
 	$user_identifier = pmpromd_user_identifier();
 
-	return get_user_by( $user_identifier, $value );
+	return get_user_by( $user_identifier, sanitize_text_field( $value ) );
 
 }
 
@@ -279,17 +279,20 @@ function pmpromd_get_user_by_identifier( $value ) {
  * @since 1.2.0
  *
  */
-function pmpromd_get_user(){
+function pmpromd_get_user( $user_id = false ){
 
-	global $wp_query;
+	global $wp_query, $current_user;
 
-	if( !empty( $wp_query->get( 'pu' ) ) ){
+	if ( $user_id ) {
+		//We're specifying which user we want to display
+		$pu = get_user_by( 'id', intval( $user_id ) );
+	} elseif ( ! empty( $wp_query->get( 'pu' ) ) ) {
 		//Using the new permalinks /profile/user
 		$pu = pmpromd_get_user_by_identifier( $wp_query->get( 'pu' ) );
-	} elseif( !empty( $_REQUEST['pu'] ) ) {
+	} elseif ( ! empty( $_REQUEST['pu'] ) ) {
 		//Using old url structure /profile/?pu=user
 		$pu = pmpromd_get_user_by_identifier( $_REQUEST['pu'] );
-	} elseif( !empty( $current_user->ID ) ) {
+	} elseif ( ! empty( $current_user->ID ) ) {
 		$pu = $current_user;
 	} else {
 		$pu = false;

readme.txt

@@ -3,7 +3,7 @@ Contributors: strangerstudios
 Tags: pmpro, paid memberships pro, members, directory
 Requires at least: 4.0
 Tested up to: 5.9
-Stable tag: 1.2
+Stable tag: 1.2.1
 
 Add a robust Member Directory and Profiles to Your Membership Site - with attributes to customize the display.
 
@@ -97,6 +97,11 @@ Please post it in the issues section of GitHub and we'll fix it as soon as we ca
 Please visit our premium support site at http://www.paidmembershipspro.com for more documentation and our support forums.
 
 == Changelog ==
+= 1.2.1 - 2022-04-07 =
+* ENHANCEMENT: Added small sanitization check for query parameter values.
+* BUG FIX: Fixed issue where passing "user_id" attribute in shortcode was returning empty results.
+* BUG FIX: Removed debug code that was causing minor output issues.
+
 = 1.2 - 2022-03-31 =
 * ENHANCEMENT: General improvements to localization and translatable strings.
 * ENHANCEMENT: Improvement to profile pretty permalinks structure that's more SEO friendly (e.g. membership-account/profile/admin/). Automatically flush permalinks when needed in admin area.

templates/profile.php

@@ -218,8 +218,7 @@ function pmpromd_profile_shortcode($atts, $content=null, $code="")
 	elseif(empty($limit))
 		$limit = 15;
 
-
-	$pu = pmpromd_get_user();
+	$pu = pmpromd_get_user( $user_id );
 
 	if ( ! empty( $pu ) ) {
 		$pu->membership_level = pmpro_getMembershipLevelForUser( $pu->ID );