From 9484b2e4aa3ca1d8955aec78d85eebad9e95cab8 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 9 Jun 2017 10:36:27 -0400
Subject: [PATCH] Corrected the order of the 'next page' and 'previous page'
 links on the member list page.

---
 functions.php                               | 13 +++++++------
 glm-member-db/views/front/members/list.html | 11 +++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/functions.php b/functions.php
index a572f83..7481120 100644
--- a/functions.php
+++ b/functions.php
@@ -354,6 +354,7 @@ function remove_cat_from_shop_loop( $q ) {
 
 }
  function get_categories_array($category, $id_field){
+    $new_array = array();
     foreach($category as $key=>$value){
         $new_array[$value[$id_field]] = $value;
     }
@@ -374,11 +375,11 @@ add_filter('member_list_header_search', function(){
 add_filter('decode_member_list_header_search', function(){
     return json_decode(apply_filters('member_list_header_search', ''), true);
 });
-$selected_region = (isset($_POST['regionUserSearch'][0]) ? $_POST['regionUserSearch'][0] : ''); 
-$selected_county =  (isset($_POST['counties'][0]) ? $_POST['counties'][0] : ''); 
-$selected_city =  (isset($_POST['cities'][0]) ? $_POST['cities'][0] : ''); 
-$selected_destination = (isset($_POST['categories'][0]) ? $_POST['categories'][0] : ''); 
-$selected_activity =  (isset($_POST['categories'][1]) ? $_POST['categories'][1] : ''); 
+$selected_region = (isset($_POST['regionUserSearch'][0]) ? $_POST['regionUserSearch'][0] : '');
+$selected_county =  (isset($_POST['counties'][0]) ? $_POST['counties'][0] : '');
+$selected_city =  (isset($_POST['cities'][0]) ? $_POST['cities'][0] : '');
+$selected_destination = (isset($_POST['categories'][0]) ? $_POST['categories'][0] : '');
+$selected_activity =  (isset($_POST['categories'][1]) ? $_POST['categories'][1] : '');
 $selected_park =  (isset($_POST['categories'][2]) ? $_POST['categories'][2] : '');
-$selected_text =  (isset($_POST['textSearch']) ? $_POST['textSearch'] : ''); 
+$selected_text =  (isset($_POST['textSearch']) ? $_POST['textSearch'] : '');
 ?>
diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index a77a824..a13d0f1 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -1,7 +1,7 @@
 
 {$searchParams = apply_filters('member_list_header_search', '')|json_decode}
 <div class="trail-list-search-terms">
-Search Terms: 
+Search Terms:
 {foreach $smarty.request as $key=>$value}
    {if $key !== 'action' && $key !== 'submit' && $key !== 'categories' }
      {if $key !== 'textSearch'}
@@ -104,7 +104,7 @@ Search Terms:
                             </div>
                             {/if}
                         {/if}
-  
+
                         {if $settings.list_show_search_region}
                             {if $regions|@count gt 0}
                             <div>
@@ -254,9 +254,8 @@ Search Terms:
     <div id="glm-member-paging-top" class="paging-wrapper">
         <div><span>showing {$start} through {$lastDisplayed} of {$filteredMembersFound}</span></div>
         <div>
-          <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}{apply_filters('glm-member-db-fields-front-list-query-params', '')}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
-           <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}{apply_filters('glm-member-db-fields-front-list-query-params', '')}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-
+            <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}{apply_filters('glm-member-db-fields-front-list-query-params', '')}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+            <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}{apply_filters('glm-member-db-fields-front-list-query-params', '')}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
         </div>
     </div>
 
@@ -571,8 +570,8 @@ Search Terms:
     <div id="glm-member-paging-bottom" class="paging-wrapper">
         <br>
         <div><span>showing {$start} through {$lastDisplayed} of {$filteredMembersFound}</span></div>
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
         <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
     </div>
     {/if}
 
-- 
2.17.1