Merge branch 'dev'

strangerstudios · Aug 5, 2022 · c69e84f · c69e84f
2 parents 4e9d50e + 1601e9a
commit c69e84f
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 56 deletions.
diff --git a/languages/pmpro-member-directory-fr_FR.mo b/languages/pmpro-member-directory-fr_FR.mo
diff --git a/languages/pmpro-member-directory-fr_FR.po b/languages/pmpro-member-directory-fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-07-07T07:19:25+00:00\n"
+"POT-Creation-Date: 2022-08-05T11:11:03+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: pmpro-member-directory\n"

diff --git a/languages/pmpro-member-directory.mo b/languages/pmpro-member-directory.mo
diff --git a/languages/pmpro-member-directory.po b/languages/pmpro-member-directory.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-07-07T07:19:24+00:00\n"
+"POT-Creation-Date: 2022-08-05T11:11:02+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: pmpro-member-directory\n"

diff --git a/languages/pmpro-member-directory.pot b/languages/pmpro-member-directory.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-07-07T07:19:24+00:00\n"
+"POT-Creation-Date: 2022-08-05T11:11:02+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: pmpro-member-directory\n"

diff --git a/pmpro-member-directory.php b/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.2
+Version: 1.2.3
 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.2' );
+define( 'PMPRO_MEMBER_DIRECTORY_VERSION', '1.2.3' );
 
 global $pmpromd_options;
 
@@ -394,7 +394,7 @@ function pmpromd_custom_rewrite_rules() {
 
 	global $pmpro_pages;
 
-	if ( empty( $pmpro_pages ) ) {
+	if ( empty( $pmpro_pages ) || empty( $pmpro_pages['profile'] ) ) {
 		return;
 	}
 
@@ -411,7 +411,7 @@ function pmpromd_custom_rewrite_rules() {
 	);
 
 }
-add_action('init', 'pmpromd_custom_rewrite_rules', 10 );
+add_action( 'init', 'pmpromd_custom_rewrite_rules', 10 );
 
 
 /**

diff --git a/readme.txt b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: strangerstudios
 Tags: pmpro, paid memberships pro, members, directory
 Requires at least: 4.0
-Tested up to: 5.9
-Stable tag: 1.2.1
+Tested up to: 6.0
+Stable tag: 1.2.3
 
 Add a robust Member Directory and Profiles to Your Membership Site - with attributes to customize the display.
 
@@ -97,6 +97,9 @@ 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.3 - 2022-08-05 =
+* BUG FIX/ENHANCEMENT: Better profile page checks prevent issues with rewrite rules. (@ideadude & @kimcoleman)
+
 = 1.2.2 - 2022-07-07 =
 * BUG FIX: Fixed issue when profile page was nested within a nested page (Thanks @JarrydLong)
 * BUG FIX: Fixed fatal error when Paid Memberships Pro plugin wasn't active. (Thanks @JarrydLong)

diff --git a/templates/profile.php b/templates/profile.php
@@ -6,61 +6,61 @@ function pmpromd_profile_preheader()
 {
 	global $post, $pmpro_pages, $current_user;
 
-	if(!empty($post->ID) && $post->ID == $pmpro_pages['profile'])
-	{
-		/*
-			Preheader operations here.
-		*/
+	// Bail if we're not on the profile page.
+	if ( empty( $pmpro_pages['profile'] ) || ! is_page( $pmpro_pages['profile'] ) ) {
+		return;
+	}
+
+	/*
+		Preheader operations here.
+	*/
+	global $main_post_id;
+	$main_post_id = $post->ID;
 
-		global $main_post_id;
-		$main_post_id = $post->ID;
+	$pu = pmpromd_get_user();
 
-		$pu = pmpromd_get_user();
-
-		// Is this user hidden from directory?
-		if ( ! empty( $pu ) ) {
-			$pmpromd_hide_directory = get_user_meta( $pu->ID, 'pmpromd_hide_directory', true );
-		} else {
-			$pmpromd_hide_directory = false;
-		}
+	// Is this user hidden from directory?
+	if ( ! empty( $pu ) ) {
+		$pmpromd_hide_directory = get_user_meta( $pu->ID, 'pmpromd_hide_directory', true );
+	} else {
+		$pmpromd_hide_directory = false;
+	}
 
-		// If no profile user, membership level, or hidden, go to directory or home.
-		if(empty($pu) || empty($pu->ID) || !pmpro_hasMembershipLevel(null, $pu->ID) || $pmpromd_hide_directory == '1' ) {
-			if(!empty($pmpro_pages['directory']))
-		 		wp_redirect(get_permalink($pmpro_pages['directory']));
-		 	else
-		 		wp_redirect(home_url());
-		 	exit;
-		}
+	// If no profile user, membership level, or hidden, go to directory or home.
+	if(empty($pu) || empty($pu->ID) || !pmpro_hasMembershipLevel(null, $pu->ID) || $pmpromd_hide_directory == '1' ) {
+		if(!empty($pmpro_pages['directory']))
+	 		wp_redirect(get_permalink($pmpro_pages['directory']));
+	 	else
+	 		wp_redirect(home_url());
+	 	exit;
+	}
 
-		// Integrate with Approvals.
-		if ( class_exists( 'PMPro_Approvals' ) ){
-			$status = PMPro_Approvals::getUserApprovalStatus( $pu->ID );
+	// Integrate with Approvals.
+	if ( class_exists( 'PMPro_Approvals' ) ){
+		$status = PMPro_Approvals::getUserApprovalStatus( $pu->ID );
 
-			if ( ! empty( $status ) && $status != 'approved' ) {
-				if ( ! empty( $pmpro_pages['directory'] ) ) {
-					wp_redirect( get_permalink( $pmpro_pages['directory'] ) );
-				} else {
-					wp_redirect(home_url());
-					exit;
-				}
-			}
-		}
-
-		/*
-			If a level is required for the profile page, make sure the profile user has it.
-		*/
-		//check is levels are required
-		$levels = pmpro_getMatches("/ levels?=[\"']([^\"^']*)[\"']/", $post->post_content, true);
-		if(!empty($levels) && !pmpro_hasMembershipLevel(explode(",", $levels), $pu->ID))
-		{
-			if(!empty($pmpro_pages['directory']))
-				wp_redirect(get_permalink($pmpro_pages['directory']));
-			else
+		if ( ! empty( $status ) && $status != 'approved' ) {
+			if ( ! empty( $pmpro_pages['directory'] ) ) {
+				wp_redirect( get_permalink( $pmpro_pages['directory'] ) );
+			} else {
 				wp_redirect(home_url());
-			exit;
+				exit;
+			}
 		}
+	}
 
+	/*
+		If a level is required for the profile page, make sure the profile user has it.
+	*/
+	//check is levels are required
+	$levels = pmpro_getMatches("/ levels?=[\"']([^\"^']*)[\"']/", $post->post_content, true);
+	if(!empty($levels) && !pmpro_hasMembershipLevel(explode(",", $levels), $pu->ID))
+	{
+		if(!empty($pmpro_pages['directory']))
+			wp_redirect(get_permalink($pmpro_pages['directory']));
+		else
+			wp_redirect(home_url());
+		exit;
 	}
 }
 add_action("wp", "pmpromd_profile_preheader", 1);