Skip to content

Commit

Permalink
Avoiding fatal errors when PMPro is deactivated
Browse files Browse the repository at this point in the history
  • Loading branch information
ideadude committed Jul 11, 2018
1 parent 96d24b0 commit c8156ff
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
23 changes: 13 additions & 10 deletions includes/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,22 @@ function pmpro_bp_get_user_options( $user_id = NULL ) {
$user_id = $current_user->ID;
}

if( !empty( $user_id ) ) {
$levels = pmpro_getMembershipLevelsForUser( $user_id );
}
// Grab levels if PMPro is active
if( function_exists( 'pmpro_getMembershipLevelsForUser' ) ) {
if( !empty( $user_id ) ) {
$levels = pmpro_getMembershipLevelsForUser( $user_id );
}

// Add Ons like PMPro Approvals filter pmpro_hasMembershipLevel, so let's double check
$new_levels = array();
foreach( $levels as $level ) {
if( pmpro_hasMembershipLevel( $level->id, $user_id ) ) {
$new_levels[] = $level;
// Add Ons like PMPro Approvals filter pmpro_hasMembershipLevel, so let's double check
$new_levels = array();
foreach( $levels as $level ) {
if( pmpro_hasMembershipLevel( $level->id, $user_id ) ) {
$new_levels[] = $level;
}
}
unset( $level );
$levels = $new_levels;
}
unset( $level );
$levels = $new_levels;

// we need the ids in a separate array
if( !empty( $levels ) ) {
Expand Down
9 changes: 9 additions & 0 deletions includes/directory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
*/

function pmpro_bp_directory_init() {
// Don't do this if PMPro is deactivated
if( !defined( 'PMPRO_VERSION' ) ) {
return;
}

global $pmpro_bp_members_in_directory;
$pmpro_bp_members_in_directory = pmpro_bp_get_members_in_directory();
add_action( 'bp_pre_user_query_construct', 'pmpro_bp_bp_pre_user_query_construct', 1, 1 );
Expand All @@ -28,6 +33,10 @@ function pmpro_bp_bp_get_total_member_count($count) {
function pmpro_bp_get_members_in_directory() {
global $wpdb, $pmpro_levels;

if( !function_exists( 'pmpro_getAllLevels' ) ) {
return array();
}

$pmpro_levels = pmpro_getAllLevels(false, true);

//see if we should include them in the member directory.
Expand Down

0 comments on commit c8156ff

Please sign in to comment.