Merge branch 'develop' into feature/amenityGroups

diff --cc models/front/members/list.php
index e5edb5e,1fb156b..408a5a7
--- 1/models/front/members/list.php
--- 2/models/front/members/list.php
+++ b/models/front/members/list.php
@@@ -219,24 -219,9 +219,24 @@@ class GlmMembersFront_members_list exte
              }
          }
  
 +        // enque the script and css for asmselect
 +        wp_enqueue_script(
 +            'asmselect',
 +            GLM_MEMBERS_PLUGIN_BASE_URL . '/js/jquery.asmselect.js',
 +            'jquery',
 +            '1.0.4a',
 +            true
 +        );
 +        wp_enqueue_style(
 +            'asmselect',
 +            GLM_MEMBERS_PLUGIN_BASE_URL . '/css/jquery.asmselect.css',
 +            null,
 +            '1.0.4a'
 +        );
 +
          // Apply any provided text search to name, description, short description, and street address
          if (isset($_REQUEST['textSearch']) && $_REQUEST['textSearch'] != '') {
-             $textSearch = filter_input(INPUT_POST, 'textSearch', FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
+             $textSearch = addslashes(filter_input(INPUT_POST, 'textSearch', FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES));
              $where .= $whereSep." (
                  (
                      SELECT true