WPCIVIUX-94 Always show time zone in event listings.

agileware · May 26, 2021 · 12ec1c2 · 12ec1c2
1 parent 10ae0f8
commit 12ec1c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/civicrm-ux.php b/civicrm-ux.php
@@ -9,7 +9,7 @@
  * Plugin Name:       WP CiviCRM UX
  * Plugin URI:        https://github.com/agileware/wp-civicrm-ux
  * Description:       A better user experience for integrating WordPress and CiviCRM
- * Version:           1.3.1
+ * Version:           1.3.2
  * Author:            Agileware
  * Author URI:        https://agileware.com.au/
  * License:           GPL-2.0+
@@ -24,7 +24,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'CIVICRM_UXVERSION', '1.3.1' );
+define( 'CIVICRM_UXVERSION', '1.3.2' );
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {

diff --git a/shortcodes/event/event-listing.php b/shortcodes/event/event-listing.php
@@ -94,13 +94,10 @@ private function get_event_item_html(array $event) {
       else {
         $end_date_text = ' to ' . CRM_Utils_Date::customFormat($end_date->format('Y-m-d H:i:s'), $config->dateformatDatetime);
       }
-
-      $end_date_text .= (!empty($event['event_tz']) ? ' ' . $event['event_tz'] : '');
-    }
-    else {
-      $start_date_text .= (!empty($event['event_tz']) ? ' ' . $event['event_tz'] : '');
     }
 
+    $end_date_text .= ' ' . (!empty($event['event_tz']) ? $event['event_tz'] : CRM_Core_Config::singleton()->userSystem->getTimeZoneString());
+
     $output = '<div class="civicrm-event-listing-item"><h3 class="civicrm-event-item-header">' . $this->get_event_info_link_html($event['id'], $event['title']) . '</h3><p class="civicrm-event-item-date">' . $start_date_text . $end_date_text . '</p>';
 
     // If on-line registration is enabled display the register now link