Merge pull request #135 from strangerstudios/dev

Merged dev into master
strangerstudios · Oct 14, 2020 · 0f21d5b · 0f21d5b
2 parents b15617f + 325a052
commit 0f21d5b
Show file tree

Hide file tree

Showing 12 changed files with 910 additions and 424 deletions.
diff --git a/README.md b/README.md
@@ -104,6 +104,12 @@ We highly recommend using this plugins for every site running Memberlite:
 
 ### Changelog
 
+**4.5.1 - 2020-10-14**
+* BUG FIX: Adjusting Nav Menus code to supress warnings and fix issue with meta menu callback not adding log in or log out links.
+* BUG FIX/ENHANCEMENT: Updated stylesheets for version 2.6+ of bbPress.
+* BUG FIX/ENHANCEMENT: Adding expected Memberlite hooks to forum.php template.
+* ENHANCEMENT: Styles to support new Payment Request Button features planned for PMPro.
+
 **4.5 - 2020-09-14**
 * SECURITY: Escaped `get_template_directory_uri` in inc/admin.php that was missing.
 * BUG FIX: Fixed bug where sidebar would show below content if "No Sidebar" layout was chosen in theme options.

diff --git a/bbpress/content-single-user.php b/bbpress/content-single-user.php
@@ -15,10 +15,10 @@
 
 	<div id="bbp-user-wrapper">
 		<div class="row">
-			<div class="medium-2 columns">
+			<div class="medium-<?php echo esc_attr( memberlite_getColumnsRatio( 'sidebar' ) ); ?> columns">
 				<?php bbp_get_template_part( 'user', 'details' ); ?>
 			</div> <!-- end medium-2 -->
-			<div class="medium-10 columns">
+			<div class="medium-<?php echo esc_attr( memberlite_getColumnsRatio() ); ?> columns">
 				<div id="bbp-user-body">
 					<?php
 					if ( bbp_is_favorites() ) {

diff --git a/components/header/meta-member.php b/components/header/meta-member.php
@@ -26,27 +26,28 @@
 			</span>
 			<?php
 		}
-		if ( has_nav_menu( 'member' ) || has_nav_menu( 'member-logged-out') ) {
-			if ( $user_ID ) {
-				$member_menu_defaults = array(
+		if ( $user_ID ) {
+			wp_nav_menu(
+				array(
 					'theme_location'  => 'member',
 					'container'       => 'nav',
 					'container_id'    => 'member-navigation',
 					'container_class' => 'member-navigation',
 					'fallback_cb'     => 'memberlite_member_menu_cb',
 					'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',
-				);
-			} else {
-				$member_menu_defaults = array(
+				)
+			);
+		} else {
+			wp_nav_menu(
+				array(
 					'theme_location'  => 'member-logged-out',
 					'container'       => 'nav',
 					'container_id'    => 'member-navigation',
 					'container_class' => 'member-navigation',
 					'fallback_cb'     => 'memberlite_member_menu_cb',
 					'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',
-				);
-			}
-			wp_nav_menu( $member_menu_defaults );
+				)
+			);
 		}
 	?>
 	</div><!-- .meta-member-inner -->

diff --git a/components/header/mobile-menu.php b/components/header/mobile-menu.php
@@ -8,23 +8,23 @@
 <?php do_action( 'memberlite_before_mobile_nav' ); ?>
 
 <?php
-if ( is_active_sidebar( 'sidebar-5' ) || has_nav_menu( 'primary' ) ) {
 	// show the mobile menu widget area
-	?>
-	<nav id="mobile-navigation" role="navigation">
-	<?php
-	if ( is_active_sidebar( 'sidebar-5' ) ) {
-		dynamic_sidebar( 'sidebar-5' );
-	} elseif ( has_nav_menu( 'primary' ) ) {
-		$mobile_defaults = array(
-			'theme_location' => 'primary',
-		);
-		wp_nav_menu( $mobile_defaults );
-	}
+	if ( is_active_sidebar( 'sidebar-5' ) || has_nav_menu( 'primary' ) ) { ?>
+		<nav id="mobile-navigation" role="navigation">
+		<?php
+			if ( is_active_sidebar( 'sidebar-5' ) ) {
+				dynamic_sidebar( 'sidebar-5' );
+			} elseif ( has_nav_menu( 'primary' ) ) {
+				wp_nav_menu(
+					array(
+						'theme_location' => 'primary',
+					)
+				);
+			}
 		?>
 		</nav>
 		<?php
-}
+	}
 ?>
 
 <?php do_action( 'memberlite_after_mobile_nav' ); ?>