From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 3 Oct 2016 19:37:12 +0000 (-0400)
Subject: Merge tag 'v2.6.2' into develop
X-Git-Tag: v2.7.0^2~17^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=841c0eebe3029568c864b33f24b58a533de0cc6b;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.6.2' into develop

Version 2.6.2
---

841c0eebe3029568c864b33f24b58a533de0cc6b
diff --cc models/admin/pages/shortcode.php
index 8826e833,06a09eb2..8bf2adcb
--- a/models/admin/pages/shortcode.php
+++ b/models/admin/pages/shortcode.php
@@@ -144,9 -144,8 +144,9 @@@ class GlmMembersAdmin_pages_shortcod
  
          $listAttr   = $this->config['addOns']['glm-member-db']['shortcodes']['glm-members-list']['attributes'];
          $detailAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-member-detail']['attributes'];
 +        $featuredAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-member-featured']['attributes'];
          $glmcat     = new GlmDataCategories( $this->wpdb, $this->config );
-         $categories = $glmcat->getListSortedParentChild();
+         $categories = $glmcat->getList('', 'T.name');
  
          // get the each addOn slugs to pass to the config array later
          $addOns = $this->config['addOns'];