Simple Calendar – Google Calendar Plugin - Version 2.3.2

Version Description

  • September 1, 2015 =
  • Fix: Bug in HTML support in events description.
Download this release

Release Info

Developer nekojira
Plugin Icon 128x128 Simple Calendar – Google Calendar Plugin
Version 2.3.2
Comparing to
See all releases

Code changes from version 2.3.1 to 2.3.2

Files changed (5) hide show
  1. class-google-calendar-events.php +1 -1
  2. google-calendar-events.php +1 -1
  3. includes/class-gce-event.php +4 -8
  4. includes/class-gce-feed.php +1 -1
  5. readme.txt +4 -1
class-google-calendar-events.php CHANGED
@@ -18,7 +18,7 @@ class Google_Calendar_Events {
18
  *
19
  * @var string
20
  */
21
- protected $version = '2.3.1';
22
 
23
  /**
24
  * Unique identifier for the plugin.
18
  *
19
  * @var string
20
  */
21
+ protected $version = '2.3.2';
22
 
23
  /**
24
  * Unique identifier for the plugin.
google-calendar-events.php CHANGED
@@ -5,7 +5,7 @@
5
  * Description: Show off your Google calendar in grid (month) or list view, in a post, page or widget, and in a style that matches your site.
6
  * Author: Moonstone Media
7
  * Author URI: http://moonstonemediagroup.com
8
- * Version: 2.3.1
9
  * Text Domain: gce
10
  * Domain Path: /languages/
11
  *
5
  * Description: Show off your Google calendar in grid (month) or list view, in a post, page or widget, and in a style that matches your site.
6
  * Author: Moonstone Media
7
  * Author URI: http://moonstonemediagroup.com
8
+ * Version: 2.3.2
9
  * Text Domain: gce
10
  * Domain Path: /languages/
11
  *
includes/class-gce-event.php CHANGED
@@ -361,16 +361,12 @@ class GCE_Event {
361
  $description = trim( $this->description );
362
 
363
  if ( 0 != $limit ) {
364
- preg_match( '/([\S]+\s*){0,' . $limit . '}/', esc_html( $this->description ), $description );
365
  $description = trim( $description[0] );
366
  }
367
 
368
  if ( $markdown || $html ) {
369
 
370
- if ( $autolink ) {
371
- $description = make_clickable( $description );
372
- }
373
-
374
  if ( $markdown && function_exists( 'Markdown' ) ) {
375
  $description = Markdown( $description );
376
  }
@@ -383,10 +379,10 @@ class GCE_Event {
383
 
384
  $description = nl2br( esc_html( $description ) );
385
 
386
- if ( $autolink ) {
387
- $description = make_clickable( $description );
388
- }
389
 
 
 
390
  }
391
 
392
  return $m[1] . $description . $m[6];
361
  $description = trim( $this->description );
362
 
363
  if ( 0 != $limit ) {
364
+ preg_match( '/([\S]+\s*){0,' . $limit . '}/', $this->description, $description );
365
  $description = trim( $description[0] );
366
  }
367
 
368
  if ( $markdown || $html ) {
369
 
 
 
 
 
370
  if ( $markdown && function_exists( 'Markdown' ) ) {
371
  $description = Markdown( $description );
372
  }
379
 
380
  $description = nl2br( esc_html( $description ) );
381
 
382
+ }
 
 
383
 
384
+ if ( $autolink ) {
385
+ $description = make_clickable( $description );
386
  }
387
 
388
  return $m[1] . $description . $m[6];
includes/class-gce-feed.php CHANGED
@@ -198,7 +198,7 @@ class GCE_Feed {
198
  foreach ( $raw_data['items'] as $event ) {
199
  $id = ( isset( $event['id'] ) ? esc_html( $event['id'] ) : '' );
200
  $title = ( isset( $event['summary'] ) ? esc_html( $event['summary'] ) : '' );
201
- $description = ( isset( $event['description'] ) ? esc_html( $event['description'] ) : '' );
202
  $link = ( isset( $event['htmlLink'] ) ? esc_url( $event['htmlLink'] ) : '' );
203
  $location = ( isset( $event['location'] ) ? esc_html( $event['location'] ) : '' );
204
 
198
  foreach ( $raw_data['items'] as $event ) {
199
  $id = ( isset( $event['id'] ) ? esc_html( $event['id'] ) : '' );
200
  $title = ( isset( $event['summary'] ) ? esc_html( $event['summary'] ) : '' );
201
+ $description = ( isset( $event['description'] ) ? $event['description'] : '' );
202
  $link = ( isset( $event['htmlLink'] ) ? esc_url( $event['htmlLink'] ) : '' );
203
  $location = ( isset( $event['location'] ) ? esc_html( $event['location'] ) : '' );
204
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: pderksen, nickyoung87, nekojira, rosshanney
3
  Tags: google calendar, google, calendar, events, gcal
4
  Requires at least: 3.9
5
  Tested up to: 4.3
6
- Stable tag: 2.3.1
7
  License: GPLv2 or later
8
 
9
  Parses Google Calendar feeds and displays the events as a calendar grid or list on a page, post or widget.
@@ -90,6 +90,9 @@ There are several ways to install this plugin.
90
 
91
  == Changelog ==
92
 
 
 
 
93
  = 2.3.1 - August 31, 2015 =
94
  * Fix: Fallback for DateTime::setTimestamp() for installations still using PHP 5.2.
95
  * Fix: Support HTML in events description when using `html="true"` attribute in shortcode.
3
  Tags: google calendar, google, calendar, events, gcal
4
  Requires at least: 3.9
5
  Tested up to: 4.3
6
+ Stable tag: 2.3.2
7
  License: GPLv2 or later
8
 
9
  Parses Google Calendar feeds and displays the events as a calendar grid or list on a page, post or widget.
90
 
91
  == Changelog ==
92
 
93
+ = 2.3.2 - September 1, 2015 =
94
+ * Fix: Bug in HTML support in events description.
95
+
96
  = 2.3.1 - August 31, 2015 =
97
  * Fix: Fallback for DateTime::setTimestamp() for installations still using PHP 5.2.
98
  * Fix: Support HTML in events description when using `html="true"` attribute in shortcode.