Merge branch 'develop' into feature/ajaxSearch

diff --cc models/front/members/list.php
index a6e45a3,4155582..af6683e
--- 1/models/front/members/list.php
--- 2/models/front/members/list.php
+++ b/models/front/members/list.php
@@@ -187,13 -187,8 +187,13 @@@ class GlmMembersFront_members_list exte
          $citySearchSelected   = false;
          $haveFeaturedMembers  = false;
          $featuredMembers      = false;
-         $memberSearch         = false;
+         $fullTextSearch       = false;
          $appendSelect         = '';
 +        $memberType           = false;
 +        $categorySearch       = false;
 +        $amenitySearch        = false;
 +        $citySearch           = false;
 +        $ajaxRequest          = false;
  
          // Paging Parameters
          $paging        = $this->config['settings']['list_pagination']; // Now this is in management
@@@ -372,26 -351,14 +363,15 @@@
              }
          }
  
-         // If there's regions shortcode or url options to restrict this page to certain regions
-         if (count($regions) > 0) {
- 
-             while ( list($k,$v) = each ($regionData) ) {
-                 if (!in_array($v['id'], $regions)) {
-                     unset ($regionData[$k]);
-                 }
-             }
- 
-         }
- 
          $counties = array();
 -        if ($actionData['request']['county-search']) {
 +        // If we have a county set in shortcode or via URL.
 +        if ( isset( $actionData['request']['county-search'] ) && $actionData['request']['county-search']) {
  
              // Convert comma separated list to an array
-             $countiesRequested = explode( ',', $actionData['request']['county-search'] );
+             $regionsRequested = explode( ',', $actionData['request']['county-search'] );
  
              // Check for numeric ID's only
-             while ( list( $k, $v ) = each( $countiesRequested ) ) {
+             while ( list( $k, $v ) = each( $regionsRequested ) ) {
                  if ( preg_match( '/^[0-9]*$/', trim( $v ) && $v > 0 ) ) {
                      $counties[] = ( $v - 0 );
                  }

diff --cc setup/shortcodes.php
Simple merge

diff --cc setup/validActions.php
Simple merge