From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 9 Feb 2018 15:05:10 +0000 (-0500)
Subject: Merge tag 'v2.10.21' into develop
X-Git-Tag: v2.10.23^2~8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=4438ec0171e3b8efffa2852840e61182ca086d4b;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.10.21' into develop

adding url get params for the member list alpha search results
---

4438ec0171e3b8efffa2852840e61182ca086d4b
diff --cc index.php
index d6ff5d65,233e92e4..7e79e31f
--- a/index.php
+++ b/index.php
@@@ -19,11 -19,9 +19,11 @@@
   * @package glmMembersDatabase
   * @author Chuck Scott <cscott@gaslightmedia.com>
   * @license http://www.gaslightmedia.com Gaslightmedia
-  * @version 2.10.20
+  * @version 2.10.21
   */
  
 +$GLOBALS['glmAssociateMemTracker'] = memory_get_usage();
 +
  // Check that we're being called by WordPress.
  if (!defined('ABSPATH')) {
      header("Location: http://".$_SERVER['SERVER_NAME']."/error/404.html");
@@@ -46,8 -44,8 +46,9 @@@
   *
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.20');
++
+ define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.21');
 -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.32');
 +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.34');
  
  // Check if plugin version is not current in WordPress option and if needed updated it
  if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {