From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 20 Nov 2018 13:04:51 +0000 (-0500)
Subject: Merge tag 'v1.2.20' into develop
X-Git-Tag: v1.3.0^2~2^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=70403245d66ca0e43f40add92e6ceeba5bff248b;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge tag 'v1.2.20' into develop

Version 1.2.20
---

70403245d66ca0e43f40add92e6ceeba5bff248b
diff --cc index.php
index 8673187,3cc050c..e4ddd02
--- a/index.php
+++ b/index.php
@@@ -1,9 -1,9 +1,9 @@@
  <?php
  /**
 - * Plugin Name: GLM Members Database Packaging
 + * Plugin Name: GLM Assoicate - Packaging Add-On
   * Plugin URI: http://www.gaslightmedia.com/
-  * Description: Gaslight Media GLM Associate Packaging database addd-on.
-  * Version: 1.2.19
+  * Description: Gaslight Media Members Database.
+  * Version: 1.2.20
   * Author: Gaslight Media
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2
@@@ -43,8 -43,8 +43,8 @@@ if (!defined('ABSPATH')) 
   *  so that we're sure the other add-ons see an up to date
   *  version from this plugin.
   */
- define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.19');
+ define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.20');
 -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.7');
 +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.8');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_PACKAGING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.9.15');
diff --cc models/front/packaging/list.php
index 51352b0,5a42f14..441e91a
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@@ -215,7 -215,16 +215,7 @@@ class GlmMembersFront_packaging_list ex
  
              // Drop the data organized by packages
              $packages = false;
-             
+ 
 -<<<<<<< Updated upstream
 -            // Sort by member name
 -            reset( $members );
 -            uasort(
 -                $members,
 -                function($a, $b) {
 -                    if ( $a['member'] == $b['member'] ) {
 -                        return 0;
 -=======
              // Determine how to sort the package list
              // The sort order config values compared are the ones from Member DB plugin.ini
              switch ($this->config['settings']['package_list_order']) {
@@@ -270,11 -285,11 +270,11 @@@
                      );
  
                      break;
-                     
+ 
              }
-             
+ 
 ->>>>>>> Stashed changes
              $byMember = true;
 +
          }
  
          // Check for alternate template requests