From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 12 Feb 2019 19:05:20 +0000 (-0500)
Subject: Sidebar events specific display parameters:
X-Git-Tag: v1.0.0^2~108^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2da7abdf48e327746f484837cd3c29bc5cd88b52;p=WP-Themes%2Fuptravel.git

Sidebar events specific display parameters:

- INT val will show sidebar and show events for that region,
  occurs when on member detail and region is found
- FALSE val will show sidebar and cause region flag to ignore,
  occurs when not on member detail (show events from all regions)
- NULL val will make sidebar events not show, occurs when we are
  on member detail but no region found
---

diff --git a/sidebar.php b/sidebar.php
index 96df2af..08675e4 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -61,12 +61,26 @@
             </div>
         <?php } ?>
 
-    <?php $memberRegion = apply_filters('get-current-memberinfo-field', 'region');?>
-    <div id="sidebar-events">
-        <h2>Upcoming Events</h2>
-        <?php echo do_shortcode('[glm-members-event-list template="eventsFrontPageCity.html" region-search="'. $memberRegion .'" limit="3"]'); ?>
-        <a href="<?php echo get_permalink(757); ?>" class="button view-all-events">View All Events</a>
-    </div>
+    <?php
+        if ( !isset($GLOBALS['glmDetailSlug']) || !$GLOBALS['glmDetailSlug'] ) {
+            $memberRegion = false; // If not on a member detail page, return events from all regions
+        } else {
+            $memberRegion = apply_filters('get-current-memberinfo-field', 'region'); // returns null if no region found
+        }
+    ?>
+    <?php 
+        // Only show sidebar if memberRegion is set. 
+        // - INT val will show sidebar and show events for that region, occurs when on member detail and region is found
+        // - FALSE val will show sidebar and cause region flag to ignore, occurs when not on member detail (show events from all regions)
+        // - NULL val will make sidebar events not show, occurs when we are on member detail but no region found
+    ?>
+    <?php if ( isset($memberRegion) ) { ?>
+        <div id="sidebar-events">
+            <h2>Upcoming Events</h2>
+            <?php echo do_shortcode('[glm-members-event-list template="eventsFrontPageCity.html" region-search="'. $memberRegion .'" limit="3"]'); ?>
+            <a href="<?php echo get_permalink(757); ?>" class="button view-all-events">View All Events</a>
+        </div>
+    <?php } ?>
     
     <br>