From bc525a562854ceaaff2e7cef7258fcdef62da09e Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 9 Nov 2017 13:31:55 -0500
Subject: [PATCH] Update for member search additions.

Check for the back_to_search with isset first.
Check to see if the user has correct permission to see the back to
search button.
---
 index.php                      | 6 +++---
 models/admin/members/list.php  | 9 +++++++--
 views/admin/member/header.html | 3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index a1cab2fb..fce93ad4 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 2.10.19
+ * Version: 2.10.20
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabase
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 2.10.19
+ * @version 2.10.20
  */
 
 // Check that we're being called by WordPress.
@@ -44,7 +44,7 @@ if (!defined('ABSPATH')) {
  *
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.19');
+define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.20');
 define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.32');
 
 // Check if plugin version is not current in WordPress option and if needed updated it
diff --git a/models/admin/members/list.php b/models/admin/members/list.php
index f8ffd6f3..80ac0815 100644
--- a/models/admin/members/list.php
+++ b/models/admin/members/list.php
@@ -129,11 +129,16 @@ class GlmMembersAdmin_members_list extends GlmDataMembers
         // Save all query parameters
         if ( isset( $_REQUEST['glm_action'] ) && $_REQUEST['glm_action'] == 'list' ) {
             $_SESSION['member_saved_search'] = $_REQUEST;
-        } else if ( !isset( $_REQUEST['glm_action'] ) && !filter_var( $_REQUEST['back_to_search'], FILTER_VALIDATE_BOOLEAN ) ) {
+        } else if ( !isset( $_REQUEST['glm_action'] )
+            && (!isset( $_REQUEST['back_to_search'] ) || !filter_var( $_REQUEST['back_to_search'], FILTER_VALIDATE_BOOLEAN ))
+        ) {
             unset( $_SESSION['member_saved_search'] );
         }
         // Check for back to search flag
-        if ( isset( $_REQUEST['back_to_search'] ) && filter_var( $_REQUEST['back_to_search'], FILTER_VALIDATE_BOOLEAN ) ) {
+        if ( isset( $_REQUEST['back_to_search'] )
+            && filter_var( $_REQUEST['back_to_search'], FILTER_VALIDATE_BOOLEAN )
+            && isset( $_SESSION['member_saved_search'] )
+        ) {
             $_REQUEST = $_SESSION['member_saved_search'];
         }
         // Check if this is a request to show archived members
diff --git a/views/admin/member/header.html b/views/admin/member/header.html
index b4407ff4..c6ac3eb4 100644
--- a/views/admin/member/header.html
+++ b/views/admin/member/header.html
@@ -15,7 +15,9 @@
             New {$terms.term_member_cap}
         {/if}
     </h2>
+{if apply_filters('glm_members_menu_members', true) }
     <a class="button button-primary glm-right" href="{$thisUrl}?page=glm-members-admin-menu-members-list&back_to_search=1">Back To Search</a>
+{/if}
 
     <h2 class="nav-tab-wrapper">
         <a href="{$thisUrl}?page={$thisPage}" class="nav-tab{if $thisAction==index || $thisAction==memberEdit || $thisAction==memberInfo} nav-tab-active{/if}">{$terms.term_member_cap} Dashboard</a>
@@ -28,4 +30,3 @@
     </h2>
     <div id="glm-admin-content-container">
 
-
-- 
2.17.1