Calendar - Version 1.3.7

Version Description

  • Added a further fix for dollar signs in event titles and descriptions
  • Reverted potential IIS related fixes as these did not fix anything for IIS users and caused problems for others
Download this release

Release Info

Developer KieranOShea
Plugin Icon 128x128 Calendar
Version 1.3.7
Comparing to
See all releases

Code changes from version 1.3.6 to 1.3.7

Files changed (3) hide show
  1. calendar.php +13 -21
  2. calendar.pot +1 -1
  3. readme.txt +6 -2
calendar.php CHANGED
@@ -7,7 +7,7 @@ Author: Kieran O'Shea
7
  Author URI: http://www.kieranoshea.com
8
  Text Domain: calendar
9
  Domain Path: /languages
10
- Version: 1.3.6
11
  */
12
 
13
  /* Copyright 2008 Kieran O'Shea (email : kieran@kieranoshea.com)
@@ -37,14 +37,6 @@ define('WP_CALENDAR_TABLE', $wpdb->prefix . 'calendar');
37
  define('WP_CALENDAR_CONFIG_TABLE', $wpdb->prefix . 'calendar_config');
38
  define('WP_CALENDAR_CATEGORIES_TABLE', $wpdb->prefix . 'calendar_categories');
39
 
40
- // All items in a GET query must be query_vars
41
- function calendar_add_query_vars_filter( $vars ){
42
- $vars[] = "month";
43
- $vars[] = "yr";
44
- return $vars;
45
- }
46
- add_filter( 'query_vars', 'calendar_add_query_vars_filter' );
47
-
48
  // Check ensure calendar is installed and install it if not - required for
49
  // the successful operation of most functions called from this point on
50
  check_calendar();
@@ -352,7 +344,7 @@ function calendar_insert($content)
352
  } else {
353
  $cal_output = calendar();
354
  }
355
- $content = preg_replace('/\{CALENDAR*.+\}/',$cal_output,$content);
356
  }
357
  return $content;
358
  }
@@ -370,7 +362,7 @@ function minical_insert($content)
370
  } else {
371
  $cal_output = minical();
372
  }
373
- $content = preg_replace('/\{MINICAL*.+\}/',$cal_output,$content);
374
  }
375
  return $content;
376
  }
@@ -388,7 +380,7 @@ function upcoming_insert($content)
388
  } else {
389
  $cal_output = '<span class="page-upcoming-events">'.upcoming_events().'</span>';
390
  }
391
- $content = preg_replace('/\{UPCOMING_EVENTS*.+\}/',$cal_output,$content);
392
  }
393
  return $content;
394
  }
@@ -404,7 +396,7 @@ function todays_insert($content)
404
  } else {
405
  $cal_output = '<span class="page-todays-events">'.todays_events().'</span>';
406
  }
407
- $content = preg_replace('/\{TODAYS_EVENTS*.+\}/',$cal_output,$content);
408
  }
409
  return $content;
410
  }
@@ -2654,8 +2646,8 @@ ORDER BY event_id";
2654
  // Setup comparison functions for building the calendar later
2655
  function calendar_month_comparison($month)
2656
  {
2657
- $get_year = get_query_var('yr');
2658
- $get_month = get_query_var('month');
2659
  $current_month = strtolower(date("M", ctwo()));
2660
  if (isset($get_year) && isset($get_month))
2661
  {
@@ -2671,8 +2663,8 @@ function calendar_month_comparison($month)
2671
  }
2672
  function calendar_year_comparison($year)
2673
  {
2674
- $get_year = get_query_var('yr');
2675
- $get_month = get_query_var('month');
2676
  $current_year = strtolower(date("Y", ctwo()));
2677
  if (isset($get_year) && isset($get_month))
2678
  {
@@ -2694,8 +2686,8 @@ function calendar($cat_list = '')
2694
  {
2695
  global $wpdb;
2696
 
2697
- $get_year = get_query_var('yr');
2698
- $get_month = get_query_var('month');
2699
 
2700
  // Deal with the week not starting on a monday
2701
  if (get_option('start_of_week') == 0)
@@ -3021,8 +3013,8 @@ function minical($cat_list = '') {
3021
 
3022
  global $wpdb;
3023
 
3024
- $get_year = get_query_var('yr');
3025
- $get_month = get_query_var('month');
3026
 
3027
  // Deal with the week not starting on a monday
3028
  if (get_option('start_of_week') == 0)
7
  Author URI: http://www.kieranoshea.com
8
  Text Domain: calendar
9
  Domain Path: /languages
10
+ Version: 1.3.7
11
  */
12
 
13
  /* Copyright 2008 Kieran O'Shea (email : kieran@kieranoshea.com)
37
  define('WP_CALENDAR_CONFIG_TABLE', $wpdb->prefix . 'calendar_config');
38
  define('WP_CALENDAR_CATEGORIES_TABLE', $wpdb->prefix . 'calendar_categories');
39
 
 
 
 
 
 
 
 
 
40
  // Check ensure calendar is installed and install it if not - required for
41
  // the successful operation of most functions called from this point on
42
  check_calendar();
344
  } else {
345
  $cal_output = calendar();
346
  }
347
+ $content = preg_replace('/\{CALENDAR*.+\}/',preg_replace('/\$(\d)/','\\\$$1',$cal_output),$content);
348
  }
349
  return $content;
350
  }
362
  } else {
363
  $cal_output = minical();
364
  }
365
+ $content = preg_replace('/\{MINICAL*.+\}/',preg_replace('/\$(\d)/','\\\$$1',$cal_output),$content);
366
  }
367
  return $content;
368
  }
380
  } else {
381
  $cal_output = '<span class="page-upcoming-events">'.upcoming_events().'</span>';
382
  }
383
+ $content = preg_replace('/\{UPCOMING_EVENTS*.+\}/',preg_replace('/\$(\d)/','\\\$$1',$cal_output),$content);
384
  }
385
  return $content;
386
  }
396
  } else {
397
  $cal_output = '<span class="page-todays-events">'.todays_events().'</span>';
398
  }
399
+ $content = preg_replace('/\{TODAYS_EVENTS*.+\}/',preg_replace('/\$(\d)/','\\\$$1',$cal_output),$content);
400
  }
401
  return $content;
402
  }
2646
  // Setup comparison functions for building the calendar later
2647
  function calendar_month_comparison($month)
2648
  {
2649
+ $get_year = (isset($_GET['yr']) ? $_GET['yr'] : null);
2650
+ $get_month = (isset($_GET['month']) ? $_GET['month'] : null);
2651
  $current_month = strtolower(date("M", ctwo()));
2652
  if (isset($get_year) && isset($get_month))
2653
  {
2663
  }
2664
  function calendar_year_comparison($year)
2665
  {
2666
+ $get_year = (isset($_GET['yr']) ? $_GET['yr'] : null);
2667
+ $get_month = (isset($_GET['month']) ? $_GET['month'] : null);
2668
  $current_year = strtolower(date("Y", ctwo()));
2669
  if (isset($get_year) && isset($get_month))
2670
  {
2686
  {
2687
  global $wpdb;
2688
 
2689
+ $get_year = (isset($_GET['yr']) ? $_GET['yr'] : null);
2690
+ $get_month = (isset($_GET['month']) ? $_GET['month'] : null);
2691
 
2692
  // Deal with the week not starting on a monday
2693
  if (get_option('start_of_week') == 0)
3013
 
3014
  global $wpdb;
3015
 
3016
+ $get_year = (isset($_GET['yr']) ? $_GET['yr'] : null);
3017
+ $get_month = (isset($_GET['month']) ? $_GET['month'] : null);
3018
 
3019
  // Deal with the week not starting on a monday
3020
  if (get_option('start_of_week') == 0)
calendar.pot CHANGED
@@ -6,7 +6,7 @@
6
  #, fuzzy
7
  msgid ""
8
  msgstr ""
9
- "Project-Id-Version: calendar-1.3.5\n"
10
  "Report-Msgid-Bugs-To: Kieran O'Shea <kieran@kieranoshea.com>\n"
11
  "POT-Creation-Date: 2015-09-22 20:42-0000\n"
12
  "PO-Revision-Date: 2015-09-22 20:42-0000\n"
6
  #, fuzzy
7
  msgid ""
8
  msgstr ""
9
+ "Project-Id-Version: calendar-1.3.7\n"
10
  "Report-Msgid-Bugs-To: Kieran O'Shea <kieran@kieranoshea.com>\n"
11
  "POT-Creation-Date: 2015-09-22 20:42-0000\n"
12
  "PO-Revision-Date: 2015-09-22 20:42-0000\n"
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: KieranOShea
3
  Donate link: http://www.kieranoshea.com
4
  Tags: calendar, dates, times, events
5
  Requires at least: 4.3.1
6
- Tested up to: 4.3.1
7
- Stable tag: 1.3.6
8
 
9
  A simple but effective Calendar plugin for WordPress that allows you to
10
  manage your events and appointments and display them to the world.
@@ -226,6 +226,10 @@ You've not called wp_head() in your theme's header and/or wp_footer() in your th
226
 
227
  == Changelog ==
228
 
 
 
 
 
229
  = 1.3.6 =
230
  * Fixed bug with all categories showing in the category key, even when the calendar above is filtered on a subset of available categories
231
  * Fix internationalisation string for "all day"
3
  Donate link: http://www.kieranoshea.com
4
  Tags: calendar, dates, times, events
5
  Requires at least: 4.3.1
6
+ Tested up to: 4.4
7
+ Stable tag: 1.3.7
8
 
9
  A simple but effective Calendar plugin for WordPress that allows you to
10
  manage your events and appointments and display them to the world.
226
 
227
  == Changelog ==
228
 
229
+ = 1.3.7 =
230
+ * Added a further fix for dollar signs in event titles and descriptions
231
+ * Reverted potential IIS related fixes as these did not fix anything for IIS users and caused problems for others
232
+
233
  = 1.3.6 =
234
  * Fixed bug with all categories showing in the category key, even when the calendar above is filtered on a subset of available categories
235
  * Fix internationalisation string for "all day"