From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 16 Feb 2018 21:35:33 +0000 (-0500)
Subject: Merge tag 'v2.10.22' into develop
X-Git-Tag: v2.10.23^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=df54a85b7ef933904b94683b7d8059c907c2eef4;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.10.22' into develop

v2.10.22
---

df54a85b7ef933904b94683b7d8059c907c2eef4
diff --cc index.php
index 7e79e31f,5ee70cb4..d87aba39
--- 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.21
+  * @version 2.10.22
   */
  
 +$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,9 -44,8 +46,8 @@@
   *
   */
  
- 
- define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.21');
+ define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.22');
 -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')) {