From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 11 Oct 2016 19:31:30 +0000 (-0400)
Subject: bumping version number, adding conditional to check for specific_dates in recurrences... 
X-Git-Tag: v1.4.7^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8312c91eb1d616fef317bef202e5a80f96dcd48d;p=WP-Plugins%2Fglm-member-db-events.git

bumping version number, adding conditional to check for specific_dates in recurrences array if the to and from dates are the same and there are specific dates that exist.
---

diff --git a/index.php b/index.php
index cace3bb..ce4dd94 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database Events
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.4.6
+ * Version: 1.4.7
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -20,7 +20,7 @@
  * @package glmMembersDatabaseEventsAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.4.6
+ * @version 1.4.7
  */
 
 /*
@@ -38,7 +38,7 @@
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.4.6');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.4.7');
 define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.22');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/models/front/events/list.php b/models/front/events/list.php
index 40c17c3..96fb993 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -644,7 +644,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         } else {
             $calendar_view = $calendar_view[0]['calendar_view'];
         }
-
+        
         // Compile template data
         $templateData = array(
             'assetsUrl'    => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/',
diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index d36f42f..ed8d67d 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -21,11 +21,12 @@
                             <div class="row glm-event-day-event">
                                 <div class="small-12 columns">
                                         <h2 class="agenda-event-name">{$event.name}</h2>
-            
                                         <div class='date-range-container'>
-                                            ( Occurring {$event.recurrences.0.from_date.date} <span class="agenda-event-recur-dates">
+                                            ( Occurring <span class="agenda-event-recur-dates"> {$event.recurrences.0.from_date.date} 
                                               {if $event.recurrences.0.from_date.date != $event.recurrences.0.to_date.date}  
                                                 - {$event.recurrences.0.to_date.date} 
+                                               {else if $event.recurrences.0.specific_dates}
+                                                - {$event.recurrences.0.specific_dates|@end|date_format:"%m/%d/%Y"} 
                                               {/if}
                                             </span>