test

diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php
index 01e6d09..4a619b5 100644 (file)
--- 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
                 }
             }
         }