From 6df7a39dd617f8259fc26656e420e506039f8505 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 7 Jun 2017 08:56:28 -0400 Subject: [PATCH] test --- models/admin/ajax/eventsCalMonthAJAX.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php index 01e6d09..4a619b5 100644 --- a/models/admin/ajax/eventsCalMonthAJAX.php +++ b/models/admin/ajax/eventsCalMonthAJAX.php @@ -85,19 +85,19 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes { $this->postAddTimes = true; $where = ''; - + if($member_id !== false && $member_id !== ''){ - $ref_dest = "= $member_id"; + $ref_dest = "AND ref_dest = $member_id"; } else { - $ref_dest = 'IS NOT NULL'; + $ref_dest = ''; } - + $where .= "T.active = 1 AND T.event IN ( SELECT ET.id FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events AS ET WHERE ET.status = " . $this->config['status_numb']['Active'] . " - AND ref_dest $ref_dest + $ref_dest ) AND $this->dateRangeTimes "; @@ -263,7 +263,18 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes $event_data[$e]['last'] = ($last); $event_data[$e]['slug'] = $event_slugs[$e]; $slug = $event_slugs[$e]; +<<<<<<< Updated upstream $event_data[$e]['url'] = GLM_MEMBERS_EVENTS_SITE_BASE_URL . "event-detail/" . $slug . "/"; +======= + + if($custom_page !== ''){ + $event_data[$e]['url'] = GLM_MEMBERS_EVENTS_SITE_BASE_URL . "$page_slug/?eventId=" . $val['event']; + + } else { + $event_data[$e]['url'] = GLM_MEMBERS_EVENTS_SITE_BASE_URL . "$page_slug/" . $slug . "/"; + } + +>>>>>>> Stashed changes } } } -- 2.17.1