From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 21 Jun 2016 12:53:40 +0000 (-0400)
Subject: Merge branch 'develop' into feature/amenityGroups
X-Git-Tag: v2.1.11^2~3^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5e76e5a02891dd6a8f066a9312dfa5ea9e85a778;p=WP-Plugins%2Fglm-member-db.git

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

5e76e5a02891dd6a8f066a9312dfa5ea9e85a778
diff --cc models/front/members/list.php
index e5edb5e4,1fb156bd..408a5a7f
--- a/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