Merge tag 'v2.10.21' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 15:05:10 +0000 (10:05 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 15:05:10 +0000 (10:05 -0500)
adding url get params for the member list alpha search results

1  2 
index.php
views/front/members/list.html

diff --cc index.php
+++ b/index.php
   * @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')) {
Simple merge