From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 2 Aug 2018 15:44:20 +0000 (-0400)
Subject: Fixed missing selected URL filter (Search only...) when clicking "Previous" and ... 
X-Git-Tag: v2.0.1^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=277ef46debb5175e40999ffeb74fa6fa97c2095f;p=WP-Plugins%2Fglm-member-db-search.git

Fixed missing selected URL filter (Search only...) when clicking "Previous" and "Next" results links.
---

diff --git a/index.php b/index.php
index a00cd5f..a68971b 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Associate - OpenSearchServer Add-On
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 2.0.0
+ * Version: 2.0.1
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabaseSearchAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 2.0.0
+ * @version 2.0.1
  */
 
 // Check that we're being called by WordPress.
@@ -43,7 +43,7 @@ if (!defined('ABSPATH')) {
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_SEARCH_PLUGIN_VERSION', '2.0.0');
+define('GLM_MEMBERS_SEARCH_PLUGIN_VERSION', '2.0.1');
 define('GLM_MEMBERS_SEARCH_PLUGIN_DB_VERSION', '0.0.5');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/models/front/search/index.php b/models/front/search/index.php
index 77090eb..7d1a7ce 100644
--- a/models/front/search/index.php
+++ b/models/front/search/index.php
@@ -118,7 +118,6 @@ class GlmMembersFront_search_index extends GLMSearch
             'operator' => 'AND'
         );
 
-
         if (isset($_REQUEST['query']) && trim($_REQUEST['query']) != '') {
             $query = trim($_REQUEST['query']);
         } else {
@@ -165,6 +164,7 @@ class GlmMembersFront_search_index extends GLMSearch
             $filter = false;
             if ($urlFilters['selected']) {
                 $urlFilter = $urlFilters['selected']['filter'];
+                $selectedUrlFilter = $urlFilters['selected']['title'];
             } elseif ($actionData['request']['url-filter']) {
                 $urlFilter = trim($actionData['request']['url-filter']);
             }
@@ -194,7 +194,8 @@ class GlmMembersFront_search_index extends GLMSearch
             'failureMessage'    => $failureMessage,
             'searchResult'      => $searchResult,
             'query'             => $query,
-            'urlFilters'        => $urlFilters
+            'urlFilters'        => $urlFilters,
+            'selectedUrlFilter' => $selectedUrlFilter
         );
 
         $view = 'index.html';
diff --git a/readme.txt b/readme.txt
index ac1fe14..0507892 100644
--- a/readme.txt
+++ b/readme.txt
@@ -32,6 +32,10 @@ e.g.
 1. Activate the plugin through the 'Plugins' menu in WordPress
 
 == Changelog ==
+= 2.0.1 =
+
+* Fixed missing selected URL filter (Search only...) when clicking "Previous" and "Next" results links.
+
 = 2.0.0 =
 
 NOTE: When upgrading to this version be sure to enter the server address in "Management" -> "Search" -> "Server URL:"
diff --git a/views/front/search/index.html b/views/front/search/index.html
index 8ae0208..794b781 100644
--- a/views/front/search/index.html
+++ b/views/front/search/index.html
@@ -33,13 +33,13 @@
                 <div class="GLMSresultsNavContainer">
 
         {if $searchResult.previousPageStartIndex !== false}
-                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.previousPageStartIndex}&rows={$searchResult.resultsPerPage}">Previous Results</a>
+                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.previousPageStartIndex}&rows={$searchResult.resultsPerPage}{if $selectedUrlFilter}&urlFilter={$selectedUrlFilter}{/if}">Previous Results</a>
         {else}
                     <span class="GLMSresultsNavInactive">Previous Results</span>
         {/if}
                     -
         {if $searchResult.nextPageStartIndex !== false}
-                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.nextPageStartIndex}&rows={$searchResult.resultsPerPage}">Next Results</a>
+                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.nextPageStartIndex}&rows={$searchResult.resultsPerPage}{if $selectedUrlFilter}&urlFilter={$selectedUrlFilter}{/if}">Next Results</a>
         {else}
                     <span class="GLMSresultsNavInactive">Next Results</span>
         {/if}
@@ -83,13 +83,13 @@
                 <div class="GLMSresultsNavContainer">
 
         {if $searchResult.previousPageStartIndex !== false}
-                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.previousPageStartIndex}&rows={$searchResult.resultsPerPage}">Previous Results</a>
+                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.previousPageStartIndex}&rows={$searchResult.resultsPerPage}{if $selectedUrlFilter}&urlFilter={$selectedUrlFilter}{/if}">Previous Results</a>
         {else}
                     <span class="GLMSresultsNavInactive">Previous Results</span>
         {/if}
                     -
         {if $searchResult.nextPageStartIndex !== false}
-                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.nextPageStartIndex}&rows={$searchResult.resultsPerPage}">Next Results</a>
+                    <a href="{$thisUrl}?GLMSearch=true&query={$query|escape:'url'}&{if $searchResult.operator == 'AND'}matchAll=on&{/if}start={$searchResult.nextPageStartIndex}&rows={$searchResult.resultsPerPage}{if $selectedUrlFilter}&urlFilter={$selectedUrlFilter}{/if}">Next Results</a>
         {else}
                     <span class="GLMSresultsNavInactive">Next Results</span>
         {/if}