From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 10 Jan 2019 19:08:57 +0000 (-0500)
Subject: Merge tag 'v2.10.47' into develop
X-Git-Tag: v2.11.0^2~15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=713a20bd5006539fd02dc5d0d21997a5b19075c6;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.10.47' into develop

version 2.10.47
---

713a20bd5006539fd02dc5d0d21997a5b19075c6
diff --cc index.php
index 7e7a1cc0,8fea5408..ee0dd90e
--- a/index.php
+++ b/index.php
@@@ -47,8 -47,8 +47,8 @@@ if (!defined('ABSPATH')) 
   *
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.46');
+ define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.47');
 -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.41');
 +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.46');
  
  // Check if plugin version is not current in WordPress option and if needed updated it
  if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {
diff --cc readme.txt
index 50f25fd5,4b97137a..756fabe8
--- a/readme.txt
+++ b/readme.txt
@@@ -66,17 -66,9 +66,20 @@@ There is of course much more to this
  (none)
  
  == Changelog ==
 += PENDING =
 +* 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.
 +* Updated what we send to Google Maps when providing driving directions to include user's current location.
 +* Added fix for problems with dialog box titles when Bootstrap is loaded.
 +
+ = 2.10.47 =
+ * Adding our foundation version.
+ 
 += 2.10.46 =
 +* Moved session startup from adminHooks.php to index.php to ensure there's always a session started.
 +* Fixed member listings not using selected sort order setting past first page.
 +* Smarty Templates updated to version 3.1.33 due to use of "each()" that is being depricated in PHP.
 +
  = 2.10.46 =
  * Moved session startup from adminHooks.php to index.php to ensure there's always a session started.