Merge tag 'v2.10.18' into develop

Version 2.10.18

diff --cc css/admin.css
Simple merge

diff --cc index.php
Simple merge

diff --cc models/admin/members/list.php
index 645933c,f8ffd6f..2d53fcf
--- 1/models/admin/members/list.php
--- 2/models/admin/members/list.php
+++ b/models/admin/members/list.php
@@@ -344,33 -359,38 +355,38 @@@ class GlmMembersAdmin_members_list exte
          // Create current month/date string to pre-populate the Month/Year field for
          $monthYear = date('F Y');
  
+         // Update the textSearch for output into the form.
+         $textSearch = str_replace("\'", "'", $textSearch );
+         $textSearch = str_replace('\\"', '"', $textSearch );
+         $textSearch = str_replace('\\', '', $textSearch );
+ 
          // Compile template data
          $templateData = array(
 -            'monthYear'      => $monthYear,
 -            'enable_members' => $enable_members,
 -            'haveMembers'    => $haveMembers,
 -            'members'        => $list,
 -            'memberCount'    => $memberCount,
 -            'categories'     => $categories,
 -            'member_types'   => $member_types,
 -            'haveFilter'     => $haveFilter,
 -            'filterArchived' => $filterArchived,
 -            'filterFeatured' => $filterFeatured,
 -            'filterPending'  => $filterPending,
 -            'catSelected' => $catSelected,
 +            'monthYear'         => $monthYear,
 +            'enable_members'    => $enable_members,
 +            'haveMembers'       => $haveMembers,
 +            'members'           => $list,
 +            'memberCount'       => $memberCount,
 +            'categories'        => $categories,
 +            'member_types'      => $member_types,
 +            'haveFilter'        => $haveFilter,
 +            'filterArchived'    => $filterArchived,
 +            'filterFeatured'    => $filterFeatured,
 +            'filterPending'     => $filterPending,
 +            'catSelected'       => $catSelected,
              'catSearchSelected' => $catSelectedString,
 -            'mTypeSelected'  => $mTypeSelected,
 -            'alphaList'      => $alphaList,
 -            'alphaSelected'  => $alphaSelected,
 -            'numbDisplayed'  => $numbDisplayed,
 -            'lastDisplayed'  => $lastDisplayed,
 -            'paging'         => $paging,
 -            'prevStart'      => $prevStart,
 -            'nextStart'      => $nextStart,
 -            'start'          => $start,
 -            'limit'          => $limit,
 -            'namesList'      => $namesList,
 -            'textSearch'     => $textSearch
 +            'mTypeSelected'     => $mTypeSelected,
 +            'alphaList'         => $alphaList,
 +            'alphaSelected'     => $alphaSelected,
 +            'numbDisplayed'     => $numbDisplayed,
 +            'lastDisplayed'     => $lastDisplayed,
 +            'paging'            => $paging,
 +            'prevStart'         => $prevStart,
 +            'nextStart'         => $nextStart,
 +            'start'             => $start,
 +            'limit'             => $limit,
 +            'namesList'         => $namesList,
 +            'textSearch'        => $textSearch
          );
  
          // Return status, suggested view, and data to controller