Merge branch 'dev' of https://github.com/strangerstudios/paid-members…

…hips-pro into dev
messica · Oct 25, 2017 · 81c15da · 81c15da
2 parents 85e7438 + 782a53f
commit 81c15da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/adminpages/reports/memberships.php b/adminpages/reports/memberships.php
@@ -51,6 +51,8 @@ function pmpro_report_memberships_widget() {
 
 		$pmpro_levels = $reordered_levels;
 	}
+
+	$pmpro_levels = apply_filters( 'pmpro_report_levels', $pmpro_levels );
 ?>
 <span id="pmpro_report_memberships">	
 	<table class="wp-list-table widefat fixed striped">

diff --git a/shortcodes/membership.php b/shortcodes/membership.php
@@ -79,6 +79,9 @@ function pmpro_shortcode_membership($atts, $content=null, $code="")
 		}
 	}
 
+	// Filter the $hasaccess so we can overwrite this for other add ons.
+	$hasaccess = apply_filters( 'pmpro_member_shortcode_access', $hasaccess );
+
 	//to show or not to show
 	if($hasaccess)
 		return do_shortcode($content);	//show content