From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 29 Sep 2016 13:22:38 +0000 (-0400)
Subject: Merge branch 'develop' into feature/lauryAdminPolishing
X-Git-Tag: v2.9.15^2~15^2~43
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6c9d9e13367eaa503f1aff87537e6aeac124934b;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into feature/lauryAdminPolishing
---

6c9d9e13367eaa503f1aff87537e6aeac124934b
diff --cc setup/validActions.php
index e217c232,c43f105a..1a1edaaa
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -88,12 -85,15 +88,13 @@@ $glmMembersValidActions = array
      ),
      'frontActions' => array(
          'members' => array(
-             'list'   => 'glm-member-db',
-             'detail' => 'glm-member-db',
+             'list'                  => 'glm-member-db',
+             'detail'                => 'glm-member-db',
+             'featured'              => 'glm-member-db'
          ),
          'error' => array(
 -            'index'                 => 'glm-member-db',
 -            'badAction'             => 'glm-member-db'
 -        )
 -    )
 +            'index'     => 'glm-member-db',
 +            'badAction' => 'glm-member-db',
 +        ),
 +    ),
  );
 -
 -?>