From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 12 May 2017 17:08:14 +0000 (-0400)
Subject: Merge branch 'develop' into feature/calendarNavigation
X-Git-Tag: v1.6.38^2~2^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ac133abb7946aba6caa3e5572442089564d982d5;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'develop' into feature/calendarNavigation
---

ac133abb7946aba6caa3e5572442089564d982d5
diff --cc models/front/events/list.php
index b60e934,df02a4a..b94133d
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@@ -808,9 -785,9 +815,11 @@@ class GlmMembersFront_events_list exten
              'mainImgUrl'   => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/',
              'imgUrl'       => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/small/',
              'calDates'     => $calDates,
 +            'months'       => $months,
 +            'json_months'  => $json_months,
              'cal_view'     => $calendar_view,
+             'pageSlug'     => $pageSlug,
+             'customPage'   => $customPage,
  //            'override'     => $override_default_view
          );
          error_reporting(E_ALL ^ E_NOTICE);