From d7f3715dd26c84b00d95ef87b0721352764d245b Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 6 Apr 2016 09:42:35 -0400 Subject: [PATCH] Update for event import still not seeing times in the event output though --- models/admin/management/events.php | 2 +- models/front/events/list.php | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/models/admin/management/events.php b/models/admin/management/events.php index f7157f8..da1816c 100644 --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@ -807,7 +807,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement if ( $etime ) { $etime = $event['bdate'] . ' ' . $etime; } else { - $etime = $event['bdate']; + $etime = $btime; } $recurData =array( 'event' => $eventId, diff --git a/models/front/events/list.php b/models/front/events/list.php index cad09ce..7a50e82 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -160,7 +160,12 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $sql = " SELECT name FROM ".GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX. "events - WHERE name like '%" . $searchTerm . "%'"; + WHERE name like '%" . $searchTerm . "%' + AND id IN ( + SELECT event + FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times AS ET + WHERE active + AND " . $this->dateRange . ") "; $results = $this->wpdb->get_results( $sql, ARRAY_A ); if ( !empty( $results ) ) { foreach ( $results as $result ) { -- 2.17.1