From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 21 Apr 2017 19:41:20 +0000 (-0400)
Subject: Figured out way to have the search only set as current date better.
X-Git-Tag: v1.6.36^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=56de559089cdf81a957419ef9f4dc968a97ceb9e;p=WP-Plugins%2Fglm-member-db-events.git

Figured out way to have the search only set as current date better.

I think it would be better if the From date is only set when they
haven't searched anything yet. If they start searching or empty out the
from date then it stays empty.
---

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index 7e99a1f..ffccd52 100644
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -645,7 +645,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
                     $fromDate = date('m/d/Y', strtotime($_REQUEST['fromDate']));
                     $fromMYSQL = date('Y-m-d', strtotime($fromDate));
                     $dateWhere = " end_time >= '$fromMYSQL' ";
-                } else if ( !$filterArchived  ) {
+                } else if ( !isset( $_REQUEST['searched'] ) ) {
                     $fromDate = date('m/d/Y');
                     $fromMYSQL = date('Y-m-d', strtotime($fromDate));
                     $dateWhere = " end_time >= '$fromMYSQL' ";
diff --git a/views/admin/events/list.html b/views/admin/events/list.html
index cf0dc0a..4f019f0 100644
--- a/views/admin/events/list.html
+++ b/views/admin/events/list.html
@@ -25,6 +25,7 @@
         <input type="hidden" name="option" value="list">
     {/if}
 
+        <input type="hidden" name="searched" value="1">
         <input type="hidden" name="prevStart" value="{$prevStart}">
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">