From: Steve Sutton <steve@gaslightmedia.com>
Date: Sat, 16 Feb 2019 11:17:10 +0000 (-0500)
Subject: Fix for is_page
X-Git-Tag: v2.11.2^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2956c680282f59fbc4d13d93084e937df2e7ca25;p=WP-Plugins%2Fglm-member-db.git

Fix for is_page

Can just call the wordpress function instead of apply_filter.
---

diff --git a/index.php b/index.php
index bff6e73d..6041d8d9 100755
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Associate - Members Plugin
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media GLM Associate core plugin and Members database.
- * Version: 2.11.1
+ * Version: 2.11.2
  * 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.11.1
+ * @version 2.11.2
  */
 
 $GLOBALS['glmAssociateMemTracker'] = memory_get_usage();
@@ -47,7 +47,7 @@ if (!defined('ABSPATH')) {
  *
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.1');
+define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.2');
 define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.46');
 
 // Check if plugin version is not current in WordPress option and if needed updated it
diff --git a/readme.txt b/readme.txt
index a2743a12..9d2cac2e 100755
--- a/readme.txt
+++ b/readme.txt
@@ -66,6 +66,9 @@ There is of course much more to this.
 (none)
 
 == Changelog ==
+= 2.11.1 - 2 =
+* Bug fixes in the smarty templates.
+
 = 2.11.0 =
 * Now locking out other processes from database update on an Add-On when one process is doing the update.
 * Added parameter to glmMembersConfigArraySetup() in glmPluginSupport.php to use names for resulting array if needed.
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 140f9481..9ed553a8 100755
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -301,10 +301,12 @@
 
     {/if} {* haveFeaturedMembers *}
 
+    {$isSearchPage = is_page('search')}
+
     {if $showSettings.list_show_list && !$blankStart}
         {if $settings.list_header_text}
         <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
-        {elseif apply_filters('is_page', 'search')}
+        {elseif $isSearchPage}
         <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
         {else}
         <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
@@ -320,7 +322,7 @@
 
             {* Alpha List *}
 
-            {if $showSettings.list_show_search_alpha && !apply_filters("is_page", 'search')}
+            {if $showSettings.list_show_search_alpha && !$isSearchPage}
                 <div class="glm-alpha-links">
                     <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s) && $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}#glm-member-list-filters-button" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
                     {foreach $alphaList as $a}